Sync heat-translator code

Sync heat-translator code from upstream

JIRA:PARSER-119

Change-Id: I2287b78ad38bc54f7740fd1ee5f08989d5e680bf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>

2 files changed, 131 insertions, 94 deletions

diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_autoscaling.py b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_autoscaling.py
new file mode 100644
index 0000000..978e965
--- /dev/null
+++ b/tosca2heat/heat-translator/translator/hot/tosca/tests/test_tosca_autoscaling.py
@@ -0,0 +1,91 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from toscaparser.nodetemplate import NodeTemplate
+from toscaparser.policy import Policy
+from toscaparser.tests.base import TestCase
+import toscaparser.utils.yamlparser
+from translator.hot.tosca.tosca_compute import ToscaCompute
+from translator.hot.tosca.tosca_policies_scaling import ToscaAutoscaling
+
+
+class AutoscalingTest(TestCase):
+
+    def _tosca_scaling_test(self, tpl_snippet, expectedprops):
+        nodetemplates = (toscaparser.utils.yamlparser.
+                         simple_parse(tpl_snippet)['node_templates'])
+        policies = (toscaparser.utils.yamlparser.
+                    simple_parse(tpl_snippet)['policies'])
+        name = list(nodetemplates.keys())[0]
+        policy_name = list(policies[0].keys())[0]
+        for policy in policies:
+            tpl = policy[policy_name]
+            targets = tpl["targets"]
+            properties = tpl["properties"]
+        try:
+            nodetemplate = NodeTemplate(name, nodetemplates)
+            toscacompute = ToscaCompute(nodetemplate)
+            toscacompute.handle_properties()
+            policy = Policy(policy_name, tpl, targets,
+                            properties, "node_templates")
+            toscascaling = ToscaAutoscaling(policy)
+            parameters = toscascaling.handle_properties([toscacompute])
+            self.assertEqual(parameters[0].properties, expectedprops)
+        except Exception:
+            raise
+
+    def test_compute_with_scaling(self):
+        tpl_snippet = '''
+        node_templates:
+          my_server_1:
+            type: tosca.nodes.Compute
+            capabilities:
+              host:
+               properties:
+                num_cpus: 2
+                disk_size: 10 GB
+                mem_size: 512 MB
+              os:
+               properties:
+           # host Operating System image properties
+                  architecture: x86_64
+                  type: Linux
+                  distribution: RHEL
+                  version: 6.5
+        policies:
+          - asg:
+              type: tosca.policies.Scaling
+              description: Simple node autoscaling
+              targets: [my_server_1]
+              triggers:
+                resize_compute:
+                  description: trigger
+                  condition:
+                    constraint: utilization greater_than 50%
+                    period: 60
+                    evaluations: 1
+                    method: average
+              properties:
+                min_instances: 2
+                max_instances: 10
+                default_instances: 3
+                increment: 1
+              '''
+
+        expectedprops = {'desired_capacity': 3,
+                         'max_size': 10,
+                         'min_size': 2,
+                         'resource': {'type': 'asg_res.yaml'}}
+
+        self._tosca_scaling_test(
+            tpl_snippet,
+            expectedprops)
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 408ee8b..1a135f4 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
@@ -10,13 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
 import mock
-from mock import patch
 
 from toscaparser.nodetemplate import NodeTemplate
 from toscaparser.tests.base import TestCase
-from toscaparser.utils.gettextutils import _
 import toscaparser.utils.yamlparser
 from translator.hot.tosca.tosca_compute import ToscaCompute
 
@@ -27,22 +24,12 @@ class ToscaComputeTest(TestCase):
         nodetemplates = (toscaparser.utils.yamlparser.
                          simple_parse(tpl_snippet)['node_templates'])
         name = list(nodetemplates.keys())[0]
-        try:
-            nodetemplate = NodeTemplate(name, nodetemplates)
-            nodetemplate.validate()
-            toscacompute = ToscaCompute(nodetemplate)
-            toscacompute.handle_properties()
-            if not self._compare_properties(toscacompute.properties,
-                                            expectedprops):
-                raise Exception(_("Hot Properties are not"
-                                  " same as expected properties"))
-        except Exception:
-            # for time being rethrowing. Will be handled future based
-            # on new development in Glance and Graffiti
-            raise
+        nodetemplate = NodeTemplate(name, nodetemplates)
+        nodetemplate.validate()
+        toscacompute = ToscaCompute(nodetemplate)
+        toscacompute.handle_properties()
 
-    def _compare_properties(self, hotprops, expectedprops):
-        return all(item in hotprops.items() for item in expectedprops.items())
+        self.assertEqual(expectedprops, toscacompute.properties)
 
     def test_node_compute_with_host_and_os_capabilities(self):
         tpl_snippet = '''
@@ -84,7 +71,6 @@ class ToscaComputeTest(TestCase):
               #left intentionally
         '''
         expectedprops = {'flavor': 'm1.large',
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -123,7 +109,6 @@ class ToscaComputeTest(TestCase):
               #left intentionally
         '''
         expectedprops = {'flavor': None,
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -137,7 +122,6 @@ class ToscaComputeTest(TestCase):
             type: tosca.nodes.Compute
         '''
         expectedprops = {'flavor': None,
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -155,7 +139,6 @@ class ToscaComputeTest(TestCase):
                 #left intentionally
         '''
         expectedprops = {'flavor': None,
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -174,7 +157,6 @@ class ToscaComputeTest(TestCase):
                   mem_size: 4 GB
         '''
         expectedprops = {'flavor': 'm1.large',
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -193,7 +175,6 @@ class ToscaComputeTest(TestCase):
                   disk_size: 10 GB
         '''
         expectedprops = {'flavor': 'm1.large',
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
@@ -211,18 +192,14 @@ class ToscaComputeTest(TestCase):
                   num_cpus: 4
         '''
         expectedprops = {'flavor': 'm1.large',
-                         'image': None,
                          'user_data_format': 'SOFTWARE_CONFIG',
                          'software_config_transport': 'POLL_SERVER_HEAT'}
         self._tosca_compute_test(
             tpl_snippet,
             expectedprops)
 
-    @patch('requests.post')
-    @patch('requests.get')
-    @patch('os.getenv')
-    def test_node_compute_with_nova_flavor(self, mock_os_getenv,
-                                           mock_get, mock_post):
+    @mock.patch('translator.common.flavors.get_flavors')
+    def test_node_compute_with_nova_flavor(self, mock_flavor):
         tpl_snippet = '''
         node_templates:
           server:
@@ -234,56 +211,19 @@ class ToscaComputeTest(TestCase):
                   disk_size: 1 GB
                   mem_size: 1 GB
         '''
-        with patch('translator.common.utils.'
-                   'check_for_env_variables') as mock_check_env:
-            mock_check_env.return_value = True
-            mock_os_getenv.side_effect = ['demo', 'demo',
-                                          'demo', 'http://abc.com/5000/',
-                                          'demo', 'demo',
-                                          'demo', 'http://abc.com/5000/']
-            mock_ks_response = mock.MagicMock()
-            mock_ks_response.status_code = 200
-            mock_ks_content = {
-                'access': {
-                    'token': {
-                        'id': 'd1dfa603-3662-47e0-b0b6-3ae7914bdf76'
-                    },
-                    'serviceCatalog': [{
-                        'type': 'compute',
-                        'endpoints': [{
-                            'publicURL': 'http://abc.com'
-                        }]
-                    }]
-                }
-            }
-            mock_ks_response.content = json.dumps(mock_ks_content)
-            mock_nova_response = mock.MagicMock()
-            mock_nova_response.status_code = 200
-            mock_flavor_content = {
-                'flavors': [{
-                    'name': 'm1.mock_flavor',
-                    'ram': 1024,
-                    'disk': 1,
-                    'vcpus': 1
-                }]
-            }
-            mock_nova_response.content = \
-                json.dumps(mock_flavor_content)
-            mock_post.return_value = mock_ks_response
-            mock_get.return_value = mock_nova_response
-            expectedprops = {'flavor': 'm1.mock_flavor',
-                             'image': None,
-                             'user_data_format': 'SOFTWARE_CONFIG',
-                             'software_config_transport': 'POLL_SERVER_HEAT'}
-            self._tosca_compute_test(
-                tpl_snippet,
-                expectedprops)
+        mock_flavor.return_value = {
+            'm1.mock_flavor': {
+                'mem_size': 1024,
+                'disk_size': 1,
+                'num_cpus': 1}
+        }
+        expectedprops = {'flavor': 'm1.mock_flavor',
+                         'user_data_format': 'SOFTWARE_CONFIG',
+                         'software_config_transport': 'POLL_SERVER_HEAT'}
+        self._tosca_compute_test(tpl_snippet, expectedprops)
 
-    @patch('requests.post')
-    @patch('requests.get')
-    @patch('os.getenv')
-    def test_node_compute_without_nova_flavor(self, mock_os_getenv,
-                                              mock_get, mock_post):
+    @mock.patch('translator.common.images.get_images')
+    def test_node_compute_with_glance_image(self, mock_images):
         tpl_snippet = '''
         node_templates:
           server:
@@ -294,19 +234,25 @@ class ToscaComputeTest(TestCase):
                   num_cpus: 1
                   disk_size: 1 GB
                   mem_size: 1 GB
+              os:
+                properties:
+                  architecture: x86_64
+                  type: Linux
+                  distribution: Fake Distribution
+                  version: 19.0
         '''
-        with patch('translator.common.utils.'
-                   'check_for_env_variables') as mock_check_env:
-            mock_check_env.return_value = True
-            mock_os_getenv.side_effect = ['demo', 'demo',
-                                          'demo', 'http://abc.com/5000/']
-            mock_ks_response = mock.MagicMock()
-            mock_ks_content = {}
-            mock_ks_response.content = json.dumps(mock_ks_content)
-            expectedprops = {'flavor': 'm1.small',
-                             'image': None,
-                             'user_data_format': 'SOFTWARE_CONFIG',
-                             'software_config_transport': 'POLL_SERVER_HEAT'}
-            self._tosca_compute_test(
-                tpl_snippet,
-                expectedprops)
+        mock_images.return_value = {
+            'fake-image-foobar': {'architecture': 'x86_64',
+                                  'type': 'Linux',
+                                  'distribution': 'Fake Distribution',
+                                  'version': '19.0'},
+            'fake-image-foobar-old': {'architecture': 'x86_64',
+                                      'type': 'Linux',
+                                      'distribution': 'Fake Distribution',
+                                      'version': '18.0'}
+        }
+        expectedprops = {'flavor': 'm1.small',
+                         'image': 'fake-image-foobar',
+                         'user_data_format': 'SOFTWARE_CONFIG',
+                         'software_config_transport': 'POLL_SERVER_HEAT'}
+        self._tosca_compute_test(tpl_snippet, expectedprops)