Skip to content

C
CONF
Commit d2a68351 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

set cloud storm interfaces

parent b3c51f92
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 34 deletions
TOSCA/application_example_2_topologies.yaml
View file @ d2a68351
imports: imports:
- nodes: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/nodes.yaml - nodes: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/nodes.yaml
- capabilities: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/capabilities.yaml - capabilities: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/capabilities.yaml
- policies: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/policies.yaml - policies: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/policies.yaml
- interfaces: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/interfaces.yml - interfaces: https://raw.githubusercontent.com/skoulouzis/DRIP/DRIP_3.0/TOSCA/types/interfaces.yml
topology_template: topology_template:
node_templates: node_templates:
compute: compute:
......
TOSCA/types/nodes.yaml
View file @ d2a68351
...@@ -120,13 +120,9 @@ node_types: ...@@ -120,13 +120,9 @@ node_types:
CloudsStorm: CloudsStorm:
type: tosca.interfaces.ARTICONF.CloudsStorm type: tosca.interfaces.ARTICONF.CloudsStorm
provision: provision:
type: AAAAAAAAAAA
inputs: inputs:
code_type: SEQ code_type: SEQ
object_type: SubTopology object_type: SubTopology
Standard:
type: tosca.interfaces.node.lifecycle.Standard
create: interfaces/playbooks/kubernetes_install.yaml
tosca.nodes.ARTICONF.VM.Compute: tosca.nodes.ARTICONF.VM.Compute:
derived_from: tosca.nodes.ARTICONF.Infrastructure derived_from: tosca.nodes.ARTICONF.Infrastructure
......
drip-planner/.idea/workspace.xml
View file @ d2a68351
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e478ccae-5352-4e8e-9efb-3f5cda44e877" name="Default Changelist" comment="" /> <list default="true" id="e478ccae-5352-4e8e-9efb-3f5cda44e877" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../TOSCA/types/nodes.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../TOSCA/types/nodes.yaml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/tosca_helper.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/tosca_helper.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
...@@ -41,7 +45,7 @@ ...@@ -41,7 +45,7 @@
<recent name="$PROJECT_DIR$/test" /> <recent name="$PROJECT_DIR$/test" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Python.__main__"> <component name="RunManager" selected="Python tests.Unittests for test_planner.MyTestCase.test_planner">
<configuration name="__main__" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration name="__main__" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="drip-planner" /> <module name="drip-planner" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
...@@ -63,6 +67,20 @@ ...@@ -63,6 +67,20 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Unittests for test_planner.MyTestCase.test_planner" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="drip-planner" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;test_planner.MyTestCase.test_planner&quot;" />
<option name="_new_targetType" value="&quot;PYTHON&quot;" />
<method v="2" />
</configuration>
<configuration name="Unittests for test_planner.MyTestCase.test_something" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true"> <configuration name="Unittests for test_planner.MyTestCase.test_something" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="drip-planner" /> <module name="drip-planner" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
...@@ -95,11 +113,13 @@ ...@@ -95,11 +113,13 @@
<item itemvalue="Python.__main__" /> <item itemvalue="Python.__main__" />
<item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_something" /> <item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_something" />
<item itemvalue="Python tests.Unittests in test_planner.py" /> <item itemvalue="Python tests.Unittests in test_planner.py" />
<item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_planner" />
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.__main__" /> <item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_planner" />
<item itemvalue="Python tests.Unittests in test_planner.py" /> <item itemvalue="Python tests.Unittests in test_planner.py" />
<item itemvalue="Python.__main__" />
<item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_something" /> <item itemvalue="Python tests.Unittests for test_planner.MyTestCase.test_something" />
</list> </list>
</recent_temporary> </recent_temporary>
...@@ -242,46 +262,50 @@ ...@@ -242,46 +262,50 @@
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state x="925" y="283" width="767" height="906" key="#__main__/67.34.2493.1406@67.34.2493.1406" timestamp="1575885420596" /> <state x="925" y="283" width="767" height="906" key="#__main__/67.34.2493.1406@67.34.2493.1406" timestamp="1575885420596" />
<state width="2155" height="582" key="DebuggerActiveHint" timestamp="1577715024259">
<screen x="67" y="34" width="2493" height="1406" />
</state>
<state width="2155" height="582" key="DebuggerActiveHint/67.34.2493.1406@67.34.2493.1406" timestamp="1577715024259" />
<state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl" timestamp="1575907769017"> <state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl" timestamp="1575907769017">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl/67.34.2493.1406@67.34.2493.1406" timestamp="1575907769017" /> <state x="1043" y="437" width="530" height="598" key="FileChooserDialogImpl/67.34.2493.1406@67.34.2493.1406" timestamp="1575907769017" />
<state width="2465" height="666" key="GridCell.Tab.0.bottom" timestamp="1577714295338"> <state width="2465" height="413" key="GridCell.Tab.0.bottom" timestamp="1577716871173">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="1825" height="283" key="GridCell.Tab.0.bottom/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782177" /> <state width="1825" height="283" key="GridCell.Tab.0.bottom/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782177" />
<state width="2465" height="666" key="GridCell.Tab.0.bottom/67.34.2493.1406@67.34.2493.1406" timestamp="1577714295338" /> <state width="2465" height="413" key="GridCell.Tab.0.bottom/67.34.2493.1406@67.34.2493.1406" timestamp="1577716871173" />
<state width="2465" height="666" key="GridCell.Tab.0.center" timestamp="1577714295336"> <state width="2465" height="413" key="GridCell.Tab.0.center" timestamp="1577716871171">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="1825" height="283" key="GridCell.Tab.0.center/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782175" /> <state width="1825" height="283" key="GridCell.Tab.0.center/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782175" />
<state width="2465" height="666" key="GridCell.Tab.0.center/67.34.2493.1406@67.34.2493.1406" timestamp="1577714295336" /> <state width="2465" height="413" key="GridCell.Tab.0.center/67.34.2493.1406@67.34.2493.1406" timestamp="1577716871171" />
<state width="2465" height="666" key="GridCell.Tab.0.left" timestamp="1577714295334"> <state width="2465" height="413" key="GridCell.Tab.0.left" timestamp="1577716871170">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="1825" height="283" key="GridCell.Tab.0.left/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782174" /> <state width="1825" height="283" key="GridCell.Tab.0.left/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782174" />
<state width="2465" height="666" key="GridCell.Tab.0.left/67.34.2493.1406@67.34.2493.1406" timestamp="1577714295334" /> <state width="2465" height="413" key="GridCell.Tab.0.left/67.34.2493.1406@67.34.2493.1406" timestamp="1577716871170" />
<state width="2465" height="666" key="GridCell.Tab.0.right" timestamp="1577714295337"> <state width="2465" height="413" key="GridCell.Tab.0.right" timestamp="1577716871172">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="1825" height="283" key="GridCell.Tab.0.right/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782176" /> <state width="1825" height="283" key="GridCell.Tab.0.right/67.34.1853.1046@67.34.1853.1046" timestamp="1576165782176" />
<state width="2465" height="666" key="GridCell.Tab.0.right/67.34.2493.1406@67.34.2493.1406" timestamp="1577714295337" /> <state width="2465" height="413" key="GridCell.Tab.0.right/67.34.2493.1406@67.34.2493.1406" timestamp="1577716871172" />
<state width="2465" height="666" key="GridCell.Tab.1.bottom" timestamp="1577714382091"> <state width="2465" height="413" key="GridCell.Tab.1.bottom" timestamp="1577716830929">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="2465" height="666" key="GridCell.Tab.1.bottom/67.34.2493.1406@67.34.2493.1406" timestamp="1577714382091" /> <state width="2465" height="413" key="GridCell.Tab.1.bottom/67.34.2493.1406@67.34.2493.1406" timestamp="1577716830929" />
<state width="2465" height="666" key="GridCell.Tab.1.center" timestamp="1577714382091"> <state width="2465" height="413" key="GridCell.Tab.1.center" timestamp="1577716830929">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="2465" height="666" key="GridCell.Tab.1.center/67.34.2493.1406@67.34.2493.1406" timestamp="1577714382091" /> <state width="2465" height="413" key="GridCell.Tab.1.center/67.34.2493.1406@67.34.2493.1406" timestamp="1577716830929" />
<state width="2465" height="666" key="GridCell.Tab.1.left" timestamp="1577714382091"> <state width="2465" height="413" key="GridCell.Tab.1.left" timestamp="1577716830929">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="2465" height="666" key="GridCell.Tab.1.left/67.34.2493.1406@67.34.2493.1406" timestamp="1577714382091" /> <state width="2465" height="413" key="GridCell.Tab.1.left/67.34.2493.1406@67.34.2493.1406" timestamp="1577716830929" />
<state width="2465" height="666" key="GridCell.Tab.1.right" timestamp="1577714382091"> <state width="2465" height="413" key="GridCell.Tab.1.right" timestamp="1577716830929">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
<state width="2465" height="666" key="GridCell.Tab.1.right/67.34.2493.1406@67.34.2493.1406" timestamp="1577714382091" /> <state width="2465" height="413" key="GridCell.Tab.1.right/67.34.2493.1406@67.34.2493.1406" timestamp="1577716830929" />
<state x="679" y="283" key="SettingsEditor" timestamp="1575885393075"> <state x="679" y="283" key="SettingsEditor" timestamp="1575885393075">
<screen x="67" y="34" width="2493" height="1406" /> <screen x="67" y="34" width="2493" height="1406" />
</state> </state>
...@@ -320,14 +344,14 @@ ...@@ -320,14 +344,14 @@
<option name="timeStamp" value="22" /> <option name="timeStamp" value="22" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/venv/lib/python3.7/site-packages/toscaparser/elements/interfaces.py</url> <url>file://$PROJECT_DIR$/venv/lib/python3.7/site-packages/toscaparser/tosca_template.py</url>
<line>41</line> <line>114</line>
<option name="timeStamp" value="23" /> <option name="timeStamp" value="29" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/venv/lib/python3.7/site-packages/toscaparser/elements/interfaces.py</url> <url>file://$PROJECT_DIR$/test/test_planner.py</url>
<line>48</line> <line>36</line>
<option name="timeStamp" value="24" /> <option name="timeStamp" value="33" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>
</breakpoint-manager> </breakpoint-manager>
......
drip-planner/util/tosca_helper.py
View file @ d2a68351
...@@ -261,7 +261,11 @@ def get_node_template_dict(node_template): ...@@ -261,7 +261,11 @@ def get_node_template_dict(node_template):
if PROPERTIES in node_template.templates[node_template.name].keys(): if PROPERTIES in node_template.templates[node_template.name].keys():
node_template_dict[PROPERTIES] = node_template.templates[node_template.name][PROPERTIES] node_template_dict[PROPERTIES] = node_template.templates[node_template.name][PROPERTIES]
if INTERFACES in node_template.templates[node_template.name].keys(): if INTERFACES in node_template.templates[node_template.name].keys():
node_template_dict[INTERFACES] = node_template.templates[node_template.name][INTERFACES] interfaces = copy.deepcopy(node_template.templates[node_template.name][INTERFACES])
for interface_name in interfaces:
if 'type' in interfaces[interface_name]:
interfaces[interface_name].pop('type')
node_template_dict[INTERFACES] = interfaces
# print(dir(node_template)) # print(dir(node_template))
# print(node_template.templates) # print(node_template.templates)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment