refactor planner: separate functions

drip_planner2/.idea/workspace.xml

@@ -2,16 +2,17 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="462ede19-adfe-472b-975e-fefefa973fe0" name="Default Changelist" comment="slolved cap error">
-      <change beforePath="$PROJECT_DIR$/../build.sh" beforeDir="false" afterPath="$PROJECT_DIR$/../build.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../drip-api/hs_err_pid26067.log" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/planner/planner.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/planner/spec_service.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/planner/basic_planner.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/planner/basic_planner.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/rpc_server.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/rpc_server.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/easy-install.pth" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/prettytable.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/pyparsing.py" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/setuptools-40.8.0-py3.6.egg" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/setuptools.pth" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/venv/lib/python3.6/site-packages/six.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../etc.tar.gz" beforeDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -19,6 +20,13 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
   </component>
@@ -35,9 +43,14 @@
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="TODO_SCOPE" value="All Places" />
     <property name="full.screen.before.presentation.mode" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../drip-provisioner" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/planner" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
   </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/planner" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -64,7 +77,7 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/planner/basic_planner.py" />
-      <option name="PARAMETERS" value="" />
+      <option name="PARAMETERS" value="test_local" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
@@ -85,7 +98,7 @@
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src/rpc_server.py" />
-      <option name="PARAMETERS" value="localhost planner_queue" />
+      <option name="PARAMETERS" value="test_local" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
       <option name="MODULE_MODE" value="false" />
@@ -180,9 +193,9 @@
           <option name="timeStamp" value="1" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/src/planner/basic_planner.py</url>
-          <line>152</line>
-          <option name="timeStamp" value="4" />
+          <url>file://$PROJECT_DIR$/src/planner/planner.py</url>
+          <line>44</line>
+          <option name="timeStamp" value="5" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>

drip_planner2/src/planner/basic_planner.py

@@ -13,9 +13,9 @@ import sys
 import pdb
 import names
 import yaml
-from utils.TOSCA_parser import *
 import logging
 
+
 # from src.utils.TOSCA_parser import TOSCAParser
 
 

drip_planner2/src/planner/spec_service.py

+
+class SpecService:
+
+    def __init__(self, props):
+        self.properties = props
+
+    def get_vm_username(self):
+        return "vm_user"
\ No newline at end of file

drip_planner2/src/rpc_server.py

@@ -8,6 +8,7 @@ import os
 import os.path
 from builtins import print
 from planner.basic_planner import *
+from planner.planner import *
 import pika
 import sys
 import tempfile
@@ -16,13 +17,13 @@ import logging
 import base64
 
 logger = logging.getLogger(__name__)
-if not getattr(logger, 'handler_set', None):
-    logger.setLevel(logging.INFO)
-    h = logging.StreamHandler()
-    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-    h.setFormatter(formatter)
-    logger.addHandler(h)
-    logger.handler_set = True
+# if not getattr(logger, 'handler_set', None):
+    # logger.setLevel(logging.INFO)
+    # h = logging.StreamHandler()
+    # formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    # h.setFormatter(formatter)
+    # logger.addHandler(h)
+    # logger.handler_set = True
 
 
 def init_chanel(args):
@@ -124,8 +125,12 @@ if __name__ == "__main__":
         #        servicetemplate_id = "wordpress_w1-wip1"
         #        planner = WineryPlanner(tosca_reposetory_api_base_url,namespace,servicetemplate_id)
         tosca_file_path = "../../TOSCA/application_example.yaml"
-        planner = BasicPlanner(tosca_file_path)
-        print(planner.get_plan())
+        # planner = BasicPlanner(tosca_file_path)
+        planner = Planner(tosca_file_path)
+        planner.resolve_requirements()
+        planner.set_infrastructure_specifications()
+        template = planner.get_tosca_template()
+        # logger.info("template ----: \n" + template)
     else:
         logger.info("Input args: " + sys.argv[0] + ' ' + sys.argv[1] + ' ' + sys.argv[2])
         channel = init_chanel(sys.argv)