Merge "Modified to get closest flavor based on minimal/no inputs"

translator/hot/tosca/tests/test_tosca_compute.py

@@ -25,6 +25,7 @@ class ToscaComputeTest(TestCase):
         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,
@@ -47,9 +48,9 @@ class ToscaComputeTest(TestCase):
             capabilities:
               host:
                 properties:
-                  disk_size: 10
+                  disk_size: 10 GB
                   num_cpus: 4
-                  mem_size: 4096
+                  mem_size: 4 GB
               os:
                 properties:
                   architecture: x86_64
@@ -71,9 +72,9 @@ class ToscaComputeTest(TestCase):
             capabilities:
               host:
                 properties:
-                  disk_size: 10
+                  disk_size: 10 GB
                   num_cpus: 4
-                  mem_size: 4096
+                  mem_size: 4 GB
               #left intentionally
         '''
         expectedprops = {'flavor': 'm1.large',
@@ -128,3 +129,65 @@ class ToscaComputeTest(TestCase):
         self._tosca_compute_test(
             tpl_snippet,
             expectedprops)
+
+    def test_node_compute_host_capabilities_without_properties(self):
+        tpl_snippet = '''
+        node_templates:
+          server:
+            type: tosca.nodes.Compute
+            capabilities:
+              host:
+                properties:
+                #left intentionally
+        '''
+        expectedprops = {'flavor': 'm1.nano'}
+        self._tosca_compute_test(
+            tpl_snippet,
+            expectedprops)
+
+    def test_node_compute_host_capabilities_without_disk_size(self):
+        tpl_snippet = '''
+        node_templates:
+          server:
+            type: tosca.nodes.Compute
+            capabilities:
+              host:
+                properties:
+                  num_cpus: 4
+                  mem_size: 4 GB
+        '''
+        expectedprops = {'flavor': 'm1.large'}
+        self._tosca_compute_test(
+            tpl_snippet,
+            expectedprops)
+
+    def test_node_compute_host_capabilities_without_mem_size(self):
+        tpl_snippet = '''
+        node_templates:
+          server:
+            type: tosca.nodes.Compute
+            capabilities:
+              host:
+                properties:
+                  num_cpus: 4
+                  disk_size: 10 GB
+        '''
+        expectedprops = {'flavor': 'm1.large'}
+        self._tosca_compute_test(
+            tpl_snippet,
+            expectedprops)
+
+    def test_node_compute_host_capabilities_without_mem_size_disk_size(self):
+        tpl_snippet = '''
+        node_templates:
+          server:
+            type: tosca.nodes.Compute
+            capabilities:
+              host:
+                properties:
+                  num_cpus: 4
+        '''
+        expectedprops = {'flavor': 'm1.large'}
+        self._tosca_compute_test(
+            tpl_snippet,
+            expectedprops)

translator/hot/tosca/tosca_compute.py

@@ -121,13 +121,17 @@ class ToscaCompute(HotResource):
         match_cpu = self._match_flavors(match_all, FLAVORS, 'num_cpus', cpu)
 
         # flavors that fit the mem size
-        mem = MemoryUnit.convert_unit_size_to_num(properties.get('mem_size'),
-                                                  'MB')
+        mem = properties.get('mem_size')
+        if mem:
+            mem = MemoryUnit.convert_unit_size_to_num(mem,
+                                                      'MB')
         match_cpu_mem = self._match_flavors(match_cpu, FLAVORS,
                                             'mem_size', mem)
         # flavors that fit the disk size
-        disk = MemoryUnit.convert_unit_size_to_num(properties.get('disk_size'),
-                                                   'GB')
+        disk = properties.get('disk_size')
+        if disk:
+            disk = MemoryUnit.convert_unit_size_to_num(disk,
+                                                       'GB')
         match_cpu_mem_disk = self._match_flavors(match_cpu_mem, FLAVORS,
                                                  'disk_size', disk)
         # if multiple match, pick the flavor with the least memory
@@ -161,7 +165,7 @@ class ToscaCompute(HotResource):
     def _match_flavors(self, this_list, this_dict, attr, size):
         '''Return from this list all flavors matching the attribute size.'''
         if not size:
-            return this_list
+            return list(this_list)
         matching_flavors = []
         for flavor in this_list:
             if isinstance(size, int):
@@ -196,7 +200,7 @@ class ToscaCompute(HotResource):
         # this will change in the future when TOSCA starts to support
         # multiple private/public IP addresses.
         if attribute == 'private_address' or \
-            attribute == 'public_address':
+           attribute == 'public_address':
                 attr['get_attr'] = [self.name, 'networks', 'private', 0]
 
         return attr