Merge branch 'dev' of github.com:micado-scale/component-optimizer into dev

Author: maystery

README.md

@@ -1,7 +1,7 @@
 # MiCADO - Scaling Optimizer with Machine Learning Support
 
 ## Don't forget to set environment
-From project rott run
+From project root run
 ```source activate optimizer```
 
 ## Test program
@@ -12,59 +12,55 @@ From project root run
 From project root run
 ```python helloMTA.py```
 
-## Start program 
-From project root run  
+## Start program
+From project root run
 ```python optimizer.py --cfg path/to_config_file```
 
-```python optimizer.py --cfg config/config.yaml```  
+```python optimizer.py --cfg config/config.yaml```
 
-```python optimizer.py --cfg config/config.yaml --host=192.168.0.60```  
+```python optimizer.py --cfg config/config.yaml --host=192.168.0.60```
 
 ```python optimizer.py --cfg config/config.yaml --host 0.0.0.0 --port 5000```
 
 
-## Test REST API 
-__GET /optimizer/hello__  
-Test REST API.  
-```curl -X GET http://193.224.59.115:5000/optimizer/hello```  
+## Test REST API
+__GET /optimizer/hello__
+Test REST API.
+```curl -X GET http://193.224.59.115:5000/optimizer/hello```
+
+```curl -X GET http://193.224.59.115:5000/```
 
-```curl -X GET http://193.224.59.115:5000/```  
-  
-__POST /optimizer/init__  
-Initialize optimizer with the neccessary constants.  
-```curl -X POST http://127.0.0.1:5000/optimizer/init --data-binary @test_files/optimizer_constants.yaml```  
+__POST /optimizer/init__
+Initialize optimizer with the neccessary constants.
+```curl -X POST http://127.0.0.1:5000/optimizer/init --data-binary @test_files/optimizer_constants.yaml```
 
 ```curl -X POST http://193.224.59.115:5000/optimizer/init --data-binary @test_files/optimizer_constants.yaml```
-  
-__POST /optimizer/sample__   
-Send a new training sample.  
-```curl -X POST http://127.0.0.1:5000/optimizer/sample --data-binary @test_files/metrics_sample_example.yaml``` 
 
-```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example.yaml```  
+__POST /optimizer/sample__
+Send a new training sample.
+```curl -X POST http://127.0.0.1:5000/optimizer/sample --data-binary @test_files/metrics_sample_example.yaml```
+
+```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example.yaml```
+
+```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example_up.yaml```
 
-```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example_up.yaml```  
+```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example_down.yaml```
 
-```curl -X POST http://193.224.59.115:5000/optimizer/sample --data-binary @test_files/metrics_sample_example_down.yaml``` 
+__GET /optimizer/advice__
+Get scaling advice.
+```curl -X GET http://127.0.0.1:5000/optimizer/advice```
 
-__POST /optimizer/backtest__    
-Test the performacne of the system on historical data.   
-```curl -X POST http://193.224.59.115:5000/optimizer/backtest --data-binary @test_files/metrics_sample_example.yaml```
-  
-__GET /optimizer/advice__     
-Get scaling advice.  
-```curl -X GET http://127.0.0.1:5000/optimizer/advice```  
+```curl -X GET http://193.224.59.115:5000/optimizer/advice```
 
-```curl -X GET http://193.224.59.115:5000/optimizer/advice```  
+```curl -X GET http://193.224.59.115:5000/optimizer/advice?last=False```
 
-```curl -X GET http://193.224.59.115:5000/optimizer/advice?last=False```  
-  
-__GET /optimizer/training_data__  
-Download zipped training data that contains both neural network and linear regression data.  
-```curl -X GET http://127.0.0.1:5000/optimizer/training_data```  
+__GET /optimizer/training_data__
+Download zipped training data that contains both neural network and linear regression data.
+```curl -X GET http://127.0.0.1:5000/optimizer/training_data```
 
-## TEST CSV  
-cd csv/csv_to_optimizer  
-source env/csv_to_optimizer/bin/activate  
-```python csv_to_optimizer.py```  
+## TEST CSV
+cd csv/csv_to_optimizer
+source env/csv_to_optimizer/bin/activate
+```python csv_to_optimizer.py```
 
 

csv_to_optimizer.py

@@ -4,7 +4,7 @@
 import time
 
 ''' PLEASE, UPDATE THE VARIABLES BELOW! '''
-inputcsvfilepath = 'grafana_data_export_long_running_test-short.csv' #input
+inputcsvfilepath = 'data/grafana_data_export_long_running_test.csv' #input
 outputcsvfilepath = 'result_for_grafana_data_export_long_running_test.csv' # ebbe tolja bele az output
 separator=';' #updated automatically if file starts with sep= string
 max_number_of_rows_to_process = 20000 # parameter ennyit dolgozhat fel
@@ -69,7 +69,7 @@ def generate_sample(values=dict()):
         if values[index] != "null" else None
       continue
     if index == column_index_of_nodecount:
-      sample['sample']['vm_number'] = int(values[index]) \
+      sample['vm_number'] = int(values[index]) \
         if values[index] != "null" else None
       continue
     values[index] = None if values[index]=="null" else float(values[index])
@@ -86,7 +86,7 @@ def generate_sample(values=dict()):
   for s in sample['sample']['target_metrics']:
     if s['value'] is None:
       return None
-  if sample['sample']['vm_number'] is None:
+  if sample['vm_number'] is None:
     return None
   return sample