change load

TOSCA/types/policies.yaml

@@ -21,11 +21,11 @@ policy_types:
   
   tosca.policies.ARTICONF.Performance.CPU:
     derived_from: tosca.policies.ARTICONF.Performance
-    description: CPU load constraint as %  
+    description: CPU load constraint as percentage  
 
   tosca.policies.ARTICONF.Performance.Mem:
     derived_from: tosca.policies.Performance
-    description: Memory load constraint as %
+    description: Memory load constraint as percentage
     
   tosca.policies.ARTICONF.Performance.Disk:
     derived_from: tosca.policies.Performance

drip-planner/.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="e478ccae-5352-4e8e-9efb-3f5cda44e877" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/test/test_default_controller.py" beforeDir="false" afterPath="$PROJECT_DIR$/../sure_tosca-flask-server/sure_tosca/test/test_default_controller.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

sure_tosca-flask-server/sure_tosca/service/tosca_template_service.py

@@ -104,7 +104,8 @@ def save(file):
     
     logger.info("Got request for tosca template")
     purge_all_tables()
-    dictionary = yaml.safe_load(file.stream)
+    # dictionary = yaml.safe_load(file.stream)
+    dictionary = yaml.load(file.stream)
     logger.info("tosca template: \n" + str(yaml.dump(dictionary)))
     # print(yaml.dump(dictionary))
     tosca_template = ToscaTemplate(yaml_dict_tpl=copy.deepcopy(dictionary))