diff options
45 files changed, 92 insertions, 12 deletions
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..e0b6ea7 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 @@ -21,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 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..f451560 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 @@ -25,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 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..0cd9586 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 @@ -25,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 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..fed922d 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 @@ -25,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 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..1cc4f56 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 @@ -460,6 +460,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 +468,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 +476,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 +484,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 +492,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..2a1bf76 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 @@ -463,6 +463,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 +471,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 +479,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 +487,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 +495,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..57623ae 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 @@ -32,12 +32,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..e2a868d 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 @@ -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 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..05fa5e6 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 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..692e701 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 @@ -20,6 +20,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: 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 44647c6..81009cc 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..0d64128 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 @@ -154,6 +154,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 +162,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..c35b54d 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 @@ -26,6 +26,7 @@ resources: 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: 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..412108f 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 @@ -197,6 +197,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..51ea198 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 @@ -195,6 +195,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..f632456 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 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..92f761b 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 } @@ -78,6 +79,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 } @@ -130,6 +132,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 } @@ -172,6 +175,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 } @@ -216,6 +220,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 } @@ -258,6 +263,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 } 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..7f045b5 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 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' } } |