diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-09 02:16:12 +0800 |
|---|---|---|
| committer | xiaodong shang <shang.xiaodong@zte.com.cn> | 2016-09-12 14:53:00 +0000 |
| commit | 10d501cf6ab7e2e892b4ce8ae4144be3d28df39a (patch) | |
| tree | dd3354f176a175f9a07291a5d19a44beadebd357 /tosca2heat/heat-translator/translator/hot | |
| parent | b16327d5e53a873d1b4bd473015dd201d167ae5e (diff) | |
Add property of software_config_transport in compute node
According to hot syntax, when deploy software into compute, it shall
include software_config_transport property in server resource, because
the openstack environment configuration may not support the default
value. so the software_config_transport shall be specified.
JIRA:PARSER-105
Change-Id: Iefe50400ae2008214bb8cb98dde719130553b3bf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
(cherry picked from commit f90be03da41fa8a233ecc84f54fa59d1f2f7021f)
Diffstat (limited to 'tosca2heat/heat-translator/translator/hot')
3 files changed, 25 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: |