diff options
49 files changed, 245 insertions, 24 deletions
diff --git a/docs/parser_docs/index.rst b/docs/parser_docs/index.rst index 791e41c..97d22db 100644 --- a/docs/parser_docs/index.rst +++ b/docs/parser_docs/index.rst @@ -11,5 +11,6 @@ Parser Project intro/intro.rst yang2tosca/yang2tosca.rst + policy2tosca/policy2tosca.rst tosca2heat/parser_new_keywords.rst vRNC_tosca_intro.rst diff --git a/docs/parser_docs/intro/intro.rst b/docs/parser_docs/intro/intro.rst index 2971224..195265e 100644 --- a/docs/parser_docs/intro/intro.rst +++ b/docs/parser_docs/intro/intro.rst @@ -38,3 +38,15 @@ For Release B, Parser offers the following capabilities: * The "vRNC_tosca_intro" document describes Parser's use case analysis on vRNC scenario. The "example" folder contains examples of tosca-nfv standard and vRNC scenario. See also https://wiki.opnfv.org/parser . + +For Release C, Parser offers additional capabilities: + +* Policy2Tosca module which enables policy related fields in tosca could be translated + into heat orchestration template correctly. Policy2Tosca module could be installed seperately + after user installed OPNFV C release platform. + +* Tosca2Heat enhancements which includes a set of feature addons for OpenStack tosca-parser module + which is integrated in the OPNFV C release platform. + +* Additional testing support. + diff --git a/tests/functest_run.sh b/tests/functest_run.sh index 2b45089..8bccef4 100755 --- a/tests/functest_run.sh +++ b/tests/functest_run.sh @@ -17,14 +17,15 @@ PARSER_CI_DEBUG=${CI_DEBUG:-false} debug="" } -PARSER_IMAGE_URL_FILE=cirros-0.3.0-x86_64-disk.img -PARSER_IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/${PARSER_IMAGE_URL_FILE} -PARSER_IMAGE_NAME=rhel-6.5-test-image +# PARSER_IMAGE_URL_FILE=cirros-0.3.0-x86_64-disk.img +PARSER_IMAGE_URL_FILE=cirros-0.3.2-x86_64-disk.img +# PARSER_IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/${PARSER_IMAGE_URL_FILE} +PARSER_IMAGE_URL=http://download.cirros-cloud.net/0.3.2/${PARSER_IMAGE_URL_FILE} +# PARSER_IMAGE_NAME=rhel-6.5-test-image +PARSER_IMAGE_NAME=cirros-0.3.2-x86_64-uec PARSER_IMAGE_FILE="${PARSER_IMAGE_NAME}.img" PARSER_IMAGE_FORMAT=qcow2 -PARSER_VM_FLAVOR=m1.tiny - PARSER_USER=parser PARSER_PASSWORD=parser PARSER_EMAIL='shang.xiaodong@zte.com.cn' @@ -36,8 +37,9 @@ PARSER_ROLE=admin PARSER_STACK_NAME=vRNC_Stack # VRNC_INPUT_TEMPLATE_FILE=../tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml -VRNC_INPUT_TEMPLATE_RAW_FILE=../tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml -VRNC_OUTPUT_TEMPLATE_FILE=./vRNC_Hot_Template.yaml +# VRNC_INPUT_TEMPLATE_RAW_FILE=../tosca2heat/heat-translator/translator/tests/data/test_tosca_nfv_sample.yaml +VRNC_INPUT_TEMPLATE_RAW_FILE=../tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml +VRNC_OUTPUT_TEMPLATE_FILE=../tosca2heat/heat-translator/translator/tests/data/vRNC/vRNC_Hot_Template.yaml VRNC_INPUT_TEMPLATE_FILE=${VRNC_INPUT_TEMPLATE_RAW_FILE%.*}_patch.yaml @@ -135,6 +137,14 @@ make_patch_for_provider_network() { } +make_patch_for_translated_file() { + + # Replace the signal_transport + echo " Patch compute:signal_transport..." + sed -i '1,$s/HEAT_SIGNAL/NO_SIGNAL/g' ${VRNC_OUTPUT_TEMPLATE_FILE} + +} + translator_and_deploy_vRNC() { @@ -161,13 +171,18 @@ translator_and_deploy_vRNC() { --output-file ${VRNC_OUTPUT_TEMPLATE_FILE} echo "" - # 5. deploy vRNC + # 5. Patch translated file + echo " Make patch for translated file..." + make_patch_for_translated_file + echo "" + + # 6. deploy vRNC echo " Deploy stack..." [[ "${PARSER_CI_DEBUG}" == "true" ]] && debug="--debug" || debug="" openstack ${debug} stack create --timeout 30 --wait --enable-rollback \ -t ${VRNC_OUTPUT_TEMPLATE_FILE} ${PARSER_STACK_NAME} - # 6. Validate the deploy result. + # 7. Validate the deploy result. echo " Checking the result of deployment..." openstack ${debug} stack show ${PARSER_STACK_NAME} | grep -qow "CREATE_COMPLETE" && { echo " Check the result of deployment successfully." diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py index 8994c63..7b83906 100644 --- a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py +++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py @@ -154,12 +154,14 @@ class HotResource(object): self.type = 'OS::Heat::SoftwareDeployment' self.properties = {'config': {'get_resource': config_name}, 'server': {'get_resource': - hosting_on_server}} + hosting_on_server}, + 'signal_transport': 'HEAT_SIGNAL'} deploy_lookup[operation] = self else: sd_config = {'config': {'get_resource': config_name}, 'server': {'get_resource': - hosting_on_server}} + hosting_on_server}, + 'signal_transport': 'HEAT_SIGNAL'} deploy_resource = \ HotResource(self.nodetemplate, deploy_name, @@ -221,7 +223,8 @@ class HotResource(object): deploy_name = tosca_source.name + '_' + tosca_target.name + \ '_connect_deploy' sd_config = {'config': {'get_resource': self.name}, - 'server': {'get_resource': hosting_server.name}} + 'server': {'get_resource': hosting_server.name}, + 'signal_transport': 'HEAT_SIGNAL'} deploy_resource = \ HotResource(self.nodetemplate, deploy_name, diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py index d42cdc8..743074b 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_compute.py @@ -53,7 +53,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': 'm1.large', 'image': 'fedora-amd64-heat-config', - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -73,7 +74,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': 'm1.large', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -93,7 +95,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': None, 'image': 'fedora-amd64-heat-config', - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -110,7 +113,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': None, 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -123,7 +127,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': None, 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -140,7 +145,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': None, 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -158,7 +164,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': 'm1.large', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -176,7 +183,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': 'm1.large', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -193,7 +201,8 @@ class ToscaComputeTest(TestCase): ''' expectedprops = {'flavor': 'm1.large', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -253,7 +262,8 @@ class ToscaComputeTest(TestCase): mock_get.return_value = mock_nova_response expectedprops = {'flavor': 'm1.mock_flavor', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) @@ -284,7 +294,8 @@ class ToscaComputeTest(TestCase): mock_ks_response.content = json.dumps(mock_ks_content) expectedprops = {'flavor': 'm1.small', 'image': None, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_compute_test( tpl_snippet, expectedprops) diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_policies.py b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_policies.py index 24368ab..881e5db 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_policies.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_policies.py @@ -74,7 +74,8 @@ class ToscaPoicyTest(TestCase): 'group': { 'get_resource': 'my_compute_placement_policy'}}, - 'user_data_format': 'SOFTWARE_CONFIG'} + 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': 'POLL_SERVER_HEAT'} self._tosca_policy_test( tpl_snippet, expectedprops) diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py index 9ceb049..16d0518 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py @@ -104,6 +104,7 @@ class ToscaCompute(HotResource): self.nodetemplate.get_capability('host'), self.nodetemplate.get_capability('os')) self.properties['user_data_format'] = 'SOFTWARE_CONFIG' + self.properties['software_config_transport'] = 'POLL_SERVER_HEAT' tosca_props = self.get_tosca_props() for key, value in tosca_props.items(): if key in self.ALLOWED_NOVA_SERVER_PROPS: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml index 7284116..dd6a234 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml @@ -15,12 +15,15 @@ resources: get_file: http://www.mycompany.org/content.tgz server: get_resource: server + signal_transport: HEAT_SIGNAL + server: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT customwebserver_create_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml index 9f722cc..f60a1bb 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml @@ -19,12 +19,15 @@ resources: get_param: install_path server: get_resource: server + signal_transport: HEAT_SIGNAL + server: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT customwebserver_create_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml index 24a2893..f973f58 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml @@ -19,12 +19,14 @@ resources: get_param: install_path server: get_resource: server + signal_transport: HEAT_SIGNAL server: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT customwebserver_create_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml index b166d7c..b1ce63c 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml @@ -19,12 +19,14 @@ resources: get_param: install_path server: get_resource: server + signal_transport: HEAT_SIGNAL server: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT customwebserver_create_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml index 1fbd44e..debbcf7 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml @@ -32,6 +32,7 @@ resources: get_resource: nodejs_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL nodejs_create_config: type: OS::Heat::SoftwareConfig @@ -54,6 +55,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - nodejs_create_deploy - mongo_db_create_deploy @@ -72,6 +74,7 @@ resources: get_resource: paypal_pizzastore_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - paypal_pizzastore_configure_deploy @@ -90,6 +93,7 @@ resources: get_resource: mongo_dbms_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL mongo_dbms_create_config: type: OS::Heat::SoftwareConfig @@ -110,6 +114,7 @@ resources: - networks server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_create_deploy @@ -127,6 +132,7 @@ resources: get_resource: mongo_dbms_start_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_configure_deploy @@ -144,6 +150,7 @@ resources: get_resource: mongo_db_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_start_deploy @@ -162,6 +169,7 @@ resources: get_resource: app_collectd_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_start_deploy @@ -184,6 +192,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_create_deploy @@ -201,6 +210,7 @@ resources: get_resource: app_collectd_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_configure_deploy @@ -218,6 +228,7 @@ resources: get_resource: app_collectd_logstash_connect_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -236,6 +247,7 @@ resources: get_resource: app_rsyslog_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_start_deploy @@ -253,6 +265,7 @@ resources: get_resource: app_rsyslog_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_rsyslog_configure_deploy @@ -275,6 +288,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_rsyslog_create_deploy @@ -292,6 +306,7 @@ resources: get_resource: app_rsyslog_logstash_connect_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -310,6 +325,7 @@ resources: get_resource: logstash_create_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_start_deploy @@ -327,6 +343,7 @@ resources: get_resource: logstash_start_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -349,6 +366,7 @@ resources: - networks server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -367,6 +385,7 @@ resources: get_resource: elasticsearch_create_config server: get_resource: elasticsearch_server + signal_transport: HEAT_SIGNAL elasticsearch_create_config: type: OS::Heat::SoftwareConfig @@ -382,6 +401,7 @@ resources: get_resource: elasticsearch_start_config server: get_resource: elasticsearch_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_create_deploy @@ -400,6 +420,7 @@ resources: get_resource: kibana_create_config server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_start_deploy @@ -426,6 +447,7 @@ resources: - networks server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - kibana_create_deploy @@ -443,6 +465,7 @@ resources: get_resource: kibana_start_config server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - kibana_configure_deploy @@ -460,6 +483,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT mongo_server: type: OS::Nova::Server @@ -467,6 +491,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT logstash_server: type: OS::Nova::Server @@ -474,6 +499,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT elasticsearch_server: type: OS::Nova::Server @@ -481,6 +507,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT kibana_server: type: OS::Nova::Server @@ -488,6 +515,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: nodejs_url: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml index 50491ef..28ac520 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml @@ -32,6 +32,7 @@ resources: get_resource: nodejs_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL nodejs_create_config: type: OS::Heat::SoftwareConfig @@ -55,6 +56,7 @@ resources: server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - nodejs_create_deploy - mongo_db_create_deploy @@ -73,6 +75,7 @@ resources: get_resource: paypal_pizzastore_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - paypal_pizzastore_configure_deploy @@ -91,6 +94,7 @@ resources: get_resource: mongo_dbms_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL mongo_dbms_create_config: type: OS::Heat::SoftwareConfig @@ -112,6 +116,7 @@ resources: server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_create_deploy @@ -129,6 +134,7 @@ resources: get_resource: mongo_dbms_start_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_configure_deploy @@ -146,6 +152,7 @@ resources: get_resource: mongo_db_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_start_deploy @@ -164,6 +171,7 @@ resources: get_resource: app_collectd_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_start_deploy @@ -186,6 +194,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_create_deploy @@ -203,6 +212,7 @@ resources: get_resource: app_collectd_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_configure_deploy @@ -220,6 +230,7 @@ resources: get_resource: app_collectd_logstash_connect_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -238,6 +249,7 @@ resources: get_resource: app_rsyslog_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_start_deploy @@ -255,6 +267,7 @@ resources: get_resource: app_rsyslog_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_rsyslog_configure_deploy @@ -277,6 +290,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_rsyslog_create_deploy @@ -294,6 +308,7 @@ resources: get_resource: app_rsyslog_logstash_connect_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -312,6 +327,7 @@ resources: get_resource: logstash_create_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_start_deploy @@ -329,6 +345,7 @@ resources: get_resource: logstash_start_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -351,6 +368,7 @@ resources: - networks server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -369,6 +387,7 @@ resources: get_resource: elasticsearch_create_config server: get_resource: elasticsearch_server + signal_transport: HEAT_SIGNAL elasticsearch_create_config: type: OS::Heat::SoftwareConfig @@ -384,6 +403,7 @@ resources: get_resource: elasticsearch_start_config server: get_resource: elasticsearch_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_create_deploy @@ -402,6 +422,7 @@ resources: get_resource: kibana_create_config server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - elasticsearch_start_deploy @@ -429,6 +450,7 @@ resources: server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - kibana_create_deploy @@ -446,6 +468,7 @@ resources: get_resource: kibana_start_config server: get_resource: kibana_server + signal_transport: HEAT_SIGNAL depends_on: - kibana_configure_deploy @@ -463,6 +486,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT mongo_server: type: OS::Nova::Server @@ -470,6 +494,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT logstash_server: type: OS::Nova::Server @@ -477,6 +502,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT elasticsearch_server: type: OS::Nova::Server @@ -484,6 +510,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT kibana_server: type: OS::Nova::Server @@ -491,6 +518,7 @@ resources: flavor: m1.large image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: nodejs_url: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml index 1dfa125..e90289d 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml @@ -12,6 +12,7 @@ resources: get_resource: generate_ssh_key_create_config server: get_resource: server1 + signal_transport: HEAT_SIGNAL import_public_key_create_deploy: type: OS::Heat::SoftwareDeployment properties: @@ -24,6 +25,7 @@ resources: - public_key server: get_resource: server2 + signal_transport: HEAT_SIGNAL depends_on: - generate_ssh_key_create_deploy server1: @@ -32,12 +34,14 @@ resources: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT server2: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT generate_ssh_key_create_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image.yaml index da8285e..cb337d1 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image.yaml @@ -15,4 +15,5 @@ resources: image: rhel-6.5-test-image key_name: {get_param: key_name} user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image_params.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image_params.yaml index 679461c..3de636d 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image_params.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_flavor_and_image_params.yaml @@ -15,4 +15,5 @@ resources: image: rhel-6.5-test-image key_name: {get_param: key_name} user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml index 318a739..fcba383 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml @@ -16,6 +16,7 @@ resources: get_resource: myapp_configure_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_database server: @@ -24,6 +25,7 @@ resources: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT myapp_configure_config: type: OS::Heat::SoftwareConfig properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world.yaml index 8cb4081..59a4f88 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world.yaml @@ -11,4 +11,5 @@ resources: flavor: m1.medium image: rhel-6.5-test-image user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world_userkey.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world_userkey.yaml index e5fadb0..79fe30d 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world_userkey.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_hello_world_userkey.yaml @@ -16,4 +16,5 @@ resources: image: rhel-6.5-test-image key_name: { get_param: key_name } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml index 29f12cc..b3c9a64 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml @@ -17,6 +17,7 @@ resources: flavor: m1.medium image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT logstash_server: type: OS::Nova::Server @@ -24,6 +25,7 @@ resources: flavor: m1.medium image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT app_collectd_create_config: type: OS::Heat::SoftwareConfig @@ -39,6 +41,7 @@ resources: get_resource: app_collectd_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_start_deploy @@ -61,6 +64,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_create_deploy @@ -78,6 +82,7 @@ resources: get_resource: app_collectd_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - app_collectd_configure_deploy @@ -95,6 +100,7 @@ resources: get_resource: logstash_create_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL logstash_start_config: type: OS::Heat::SoftwareConfig @@ -110,6 +116,7 @@ resources: get_resource: logstash_start_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy @@ -127,6 +134,7 @@ resources: get_resource: app_collectd_logstash_connect_config server: get_resource: logstash_server + signal_transport: HEAT_SIGNAL depends_on: - logstash_create_deploy diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml index 0399c06..f085b9d 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml @@ -12,6 +12,7 @@ resources: get_resource: softwarecomponent_depending_on_customcompute_install_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - server_create_deploy server: @@ -20,6 +21,7 @@ resources: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT softwarecomponent_depending_on_customcompute_install_create_config: type: OS::Heat::SoftwareConfig properties: @@ -41,4 +43,5 @@ resources: install_path: /opt server: get_resource: server + signal_transport: HEAT_SIGNAL outputs: {}
\ No newline at end of file diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml index 79750d4..d9b3bc0 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nfv_sample.yaml @@ -13,6 +13,7 @@ resources: networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - VDU2 - BlockStorage @@ -25,6 +26,7 @@ resources: networks: - port: { get_resource: CP2 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT BlockStorage: type: OS::Cinder::Volume diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml index 3406b51..b8de0e0 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml @@ -28,6 +28,7 @@ resources: get_resource: mongo_dbms_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL mongo_dbms_create_config: type: OS::Heat::SoftwareConfig @@ -48,6 +49,7 @@ resources: - networks server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_create_deploy @@ -65,6 +67,7 @@ resources: get_resource: mongo_dbms_start_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_configure_deploy @@ -82,6 +85,7 @@ resources: get_resource: mongo_db_create_config server: get_resource: mongo_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_dbms_start_deploy @@ -99,6 +103,7 @@ resources: get_resource: nodejs_create_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL nodejs_create_config: type: OS::Heat::SoftwareConfig @@ -120,6 +125,7 @@ resources: - networks server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - mongo_db_create_deploy - nodejs_create_deploy @@ -138,6 +144,7 @@ resources: get_resource: paypal_pizzastore_start_config server: get_resource: app_server + signal_transport: HEAT_SIGNAL depends_on: - paypal_pizzastore_configure_deploy @@ -154,6 +161,7 @@ resources: flavor: m1.medium image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT app_server: type: OS::Nova::Server @@ -161,6 +169,7 @@ resources: flavor: m1.medium image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: mongodb_url: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_policies.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_policies.yaml index c7cfa44..786a2e9 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_policies.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_policies.yaml @@ -15,6 +15,7 @@ resources: group: get_resource: my_compute_placement_policy user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_compute_placement_policy: type: OS::Nova::ServerGroup properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml index 5f0585d..f0f7021 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml @@ -13,6 +13,7 @@ resources: get_resource: customwebserver2_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL customwebserver_create_deploy: type: OS::Heat::SoftwareDeployment properties: @@ -20,12 +21,14 @@ resources: get_resource: customwebserver_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL server: type: OS::Nova::Server properties: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT customwebserver2_start_config: type: OS::Heat::SoftwareConfig properties: @@ -39,6 +42,7 @@ resources: get_resource: customwebserver2_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - customwebserver2_configure_deploy customwebserver2_create_config: @@ -60,6 +64,7 @@ resources: get_resource: customwebserver2_configure_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - customwebserver2_create_deploy customwebserver_start_config: @@ -75,6 +80,7 @@ resources: get_resource: customwebserver_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - customwebserver_configure_deploy customwebserver_create_config: @@ -96,6 +102,7 @@ resources: get_resource: customwebserver_configure_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - customwebserver_create_deploy outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml index fbbeab2..c43c125 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml @@ -54,6 +54,7 @@ resources: get_param: db_root_pwd server: get_resource: server + signal_transport: HEAT_SIGNAL mysql_dbms_start_config: type: OS::Heat::SoftwareConfig @@ -69,6 +70,7 @@ resources: get_resource: mysql_dbms_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_configure_deploy @@ -88,6 +90,7 @@ resources: db_port: 3366 server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_create_deploy @@ -114,6 +117,7 @@ resources: get_param: db_user server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_start_deploy @@ -131,6 +135,7 @@ resources: get_resource: webserver_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL webserver_start_config: type: OS::Heat::SoftwareConfig @@ -146,6 +151,7 @@ resources: get_resource: webserver_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - webserver_create_deploy @@ -163,6 +169,7 @@ resources: get_resource: wordpress_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - webserver_start_deploy - mysql_database_configure_deploy @@ -188,6 +195,7 @@ resources: get_param: db_user server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - wordpress_create_deploy @@ -197,6 +205,7 @@ resources: flavor: m1.xlarge image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: website_url: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml index 02c0543..0f954cf 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml @@ -51,6 +51,7 @@ resources: get_resource: mysql_dbms_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL mysql_dbms_start_config: type: OS::Heat::SoftwareConfig @@ -66,6 +67,7 @@ resources: get_resource: mysql_dbms_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_configure_deploy @@ -86,6 +88,7 @@ resources: get_param: db_root_pwd server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_create_deploy @@ -112,6 +115,7 @@ resources: get_param: db_user server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - mysql_dbms_start_deploy @@ -129,6 +133,7 @@ resources: get_resource: webserver_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL webserver_start_config: type: OS::Heat::SoftwareConfig @@ -144,6 +149,7 @@ resources: get_resource: webserver_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - webserver_create_deploy @@ -161,6 +167,7 @@ resources: get_resource: wordpress_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - webserver_start_deploy - mysql_database_configure_deploy @@ -186,6 +193,7 @@ resources: get_param: db_user server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - wordpress_create_deploy @@ -195,6 +203,7 @@ resources: flavor: m1.xlarge image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: website_url: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml index e494791..43c73dc 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server.yaml @@ -24,6 +24,7 @@ resources: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: private_ip: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml index 6211cad..1afe185 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_with_input.yaml @@ -24,6 +24,7 @@ resources: flavor: m1.small image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: private_ip: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml index 22a0198..3c98514 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_with_defaults_without_input.yaml @@ -24,6 +24,7 @@ resources: flavor: m1.large image: ubuntu-12.04-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: private_ip: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_without_tosca_os_version.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_without_tosca_os_version.yaml index d2828cf..b0b2e02 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_without_tosca_os_version.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_server_without_tosca_os_version.yaml @@ -14,4 +14,5 @@ resources: flavor: m1.medium image: rhel-6.5-test-image user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT outputs: {} diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml index b1bbe49..41663c6 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml @@ -22,6 +22,7 @@ resources: flavor: m1.small image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_software_create_deploy: type: OS::Heat::SoftwareDeployment @@ -30,6 +31,7 @@ resources: get_resource: my_software_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL my_software_create_config: type: OS::Heat::SoftwareConfig @@ -45,6 +47,7 @@ resources: get_resource: my_software_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - my_software_create_deploy diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml index b8cc518..c669f19 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml @@ -34,6 +34,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: MM_Active_Port_EMS } @@ -55,6 +56,7 @@ resources: get_resource: MM_Active_create_config server: get_resource: MM_Active_Host + signal_transport: HEAT_SIGNAL MM_Active_configure_config: type: OS::Heat::SoftwareConfig @@ -70,6 +72,7 @@ resources: get_resource: MM_Active_configure_config server: get_resource: MM_Active_Host + signal_transport: HEAT_SIGNAL depends_on: - MM_Active_create_deploy @@ -78,6 +81,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: MM_Passive_Port_EMS } @@ -101,6 +105,7 @@ resources: get_resource: MM_Passive_create_config server: get_resource: MM_Passive_Host + signal_transport: HEAT_SIGNAL MM_Passive_configure_config: type: OS::Heat::SoftwareConfig @@ -116,6 +121,7 @@ resources: get_resource: MM_Passive_configure_config server: get_resource: MM_Passive_Host + signal_transport: HEAT_SIGNAL depends_on: - MM_Passive_create_deploy @@ -130,6 +136,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: CM_Active_Port_CTRL } @@ -149,6 +156,7 @@ resources: get_resource: CM_Active_create_config server: get_resource: CM_Active_Host + signal_transport: HEAT_SIGNAL CM_Active_configure_config: type: OS::Heat::SoftwareConfig @@ -164,6 +172,7 @@ resources: get_resource: CM_Active_configure_config server: get_resource: CM_Active_Host + signal_transport: HEAT_SIGNAL depends_on: - CM_Active_create_deploy @@ -172,6 +181,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: CM_Passive_Port_CTRL } @@ -193,6 +203,7 @@ resources: get_resource: CM_Passive_create_config server: get_resource: CM_Passive_Host + signal_transport: HEAT_SIGNAL CM_Passive_configure_config: type: OS::Heat::SoftwareConfig @@ -208,6 +219,7 @@ resources: get_resource: CM_Passive_configure_config server: get_resource: CM_Passive_Host + signal_transport: HEAT_SIGNAL depends_on: - CM_Passive_create_deploy @@ -216,6 +228,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: DM_Port_CTRL } @@ -235,6 +248,7 @@ resources: get_resource: DM_create_config server: get_resource: DM_Host + signal_transport: HEAT_SIGNAL DM_configure_config: type: OS::Heat::SoftwareConfig @@ -250,6 +264,7 @@ resources: get_resource: DM_configure_config server: get_resource: DM_Host + signal_transport: HEAT_SIGNAL depends_on: - DM_create_deploy @@ -258,6 +273,7 @@ resources: properties: flavor: m1.tiny user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT image: cirros-0.3.2-x86_64-uec networks: - port: { get_resource: LB_Port_CTRL } @@ -278,6 +294,7 @@ resources: get_resource: LB_create_config server: get_resource: LB_Host + signal_transport: HEAT_SIGNAL LB_configure_config: type: OS::Heat::SoftwareConfig @@ -293,6 +310,7 @@ resources: get_resource: LB_configure_config server: get_resource: LB_Host + signal_transport: HEAT_SIGNAL depends_on: - LB_create_deploy diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml index 38f12e6..278031b 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml @@ -27,6 +27,7 @@ resources: flavor: m1.medium image: ubuntu-software-config-os-init user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT web_server_create_deploy: type: OS::Heat::SoftwareDeployment @@ -35,6 +36,7 @@ resources: get_resource: web_server_create_config server: get_resource: server + signal_transport: HEAT_SIGNAL web_server_create_config: type: OS::Heat::SoftwareConfig @@ -50,6 +52,7 @@ resources: get_resource: web_server_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - web_server_create_deploy @@ -70,6 +73,7 @@ resources: get_param: context_root server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - web_server_start_deploy @@ -87,6 +91,7 @@ resources: get_resource: web_app_start_config server: get_resource: server + signal_transport: HEAT_SIGNAL depends_on: - web_app_create_deploy diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml index 556dcf4..a2f1e4a 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml @@ -13,6 +13,7 @@ resources: networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT CP1: type: OS::Neutron::Port properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml index cfcd290..67653e6 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml index f8674e1..81f69d1 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml @@ -16,6 +16,7 @@ resources: - port: { get_resource: my_port2 } - port: { get_resource: my_port3 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network1: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml index b8282b5..5b04831 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_port: type: OS::Neutron::Port diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml index 21157bb..64fc008 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml @@ -30,6 +30,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_server2: type: OS::Nova::Server @@ -39,6 +40,7 @@ resources: networks: - port: { get_resource: my_port2 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml index 6803858..fe52053 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment.yaml @@ -35,6 +35,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml index 0450b1f..b5724eb 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt1.yaml @@ -39,6 +39,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -57,6 +58,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml index e65e789..9c1cfbf 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation1_alt2.yaml @@ -39,6 +39,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -57,6 +58,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml index a8c114e..586edf7 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt1.yaml @@ -43,6 +43,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -61,6 +62,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml index 59b46ae..1bb9059 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_attachment_notation2_alt2.yaml @@ -43,6 +43,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -61,6 +62,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml index 639832c..efc9be8 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_custom_relationship_type.yaml @@ -35,6 +35,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml index 20b77c2..fb83841 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_blockstorage_with_relationship_template.yaml @@ -31,6 +31,7 @@ resources: flavor: m1.small image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml index cff83f9..5d72b01 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt1.yaml @@ -34,6 +34,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -61,6 +62,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage2 diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml index 0fdcb4b..d3dbed6 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/storage/hot_multiple_blockstorage_with_attachment_alt2.yaml @@ -34,6 +34,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage @@ -61,6 +62,7 @@ resources: flavor: m1.medium image: fedora-amd64-heat-config user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT depends_on: - my_storage2 diff --git a/tosca2heat/heat-translator/translator/tests/test_shell.py b/tosca2heat/heat-translator/translator/tests/test_shell.py index 5d41921..595c058 100644 --- a/tosca2heat/heat-translator/translator/tests/test_shell.py +++ b/tosca2heat/heat-translator/translator/tests/test_shell.py @@ -151,6 +151,8 @@ class ShellTest(TestCase): 'properties': { 'flavor': 'm1.medium', 'user_data_format': 'SOFTWARE_CONFIG', + 'software_config_transport': + 'POLL_SERVER_HEAT', 'image': 'rhel-6.5-test-image' } } |