various API fixes/updates

* updated Flavor to support max_vms through API
* updated tests
* fixed count of flavors on resource class detail
* fixed Flavor capacity retrieval

Change-Id: I08cfad9d8af5b24730d17cdf0a5e5809b45d7f58

1 files changed, 13 insertions, 10 deletions

diff --git a/openstack_dashboard/api/tuskar.py b/openstack_dashboard/api/tuskar.py
index f80655ba..be4f690e 100644
--- a/openstack_dashboard/api/tuskar.py
+++ b/openstack_dashboard/api/tuskar.py
@@ -15,6 +15,7 @@
 import copy
 import logging
 import re
+from collections import namedtuple
 from datetime import timedelta
 from random import randint
 
@@ -784,23 +785,20 @@ class FlavorTemplate(StringIdAPIResourceWrapper):
 class Flavor(StringIdAPIResourceWrapper):
     """Wrapper for the Flavor object returned by Tuskar.
     """
-    _attrs = ['name']
+    _attrs = ['name', 'max_vms']
 
     @classmethod
     def create(cls, request, resource_class_id, name, max_vms, capacities):
         return cls(tuskarclient(request).flavors.create(
-            resource_class_id, name=name, capacities=capacities))
+                resource_class_id,
+                name=name,
+                max_vms=max_vms,
+                capacities=capacities))
 
     @classmethod
     def delete(cls, request, resource_class_id, flavor_id):
         tuskarclient(request).flavors.delete(resource_class_id, flavor_id)
 
-    # FIXME: has to be implemented in API
-    # https://github.com/tuskar/tuskar/issues/43
-    @property
-    def max_vms(self):
-        return 2
-
     # FIXME: returns flavor template for this flavor
     @property
     def flavor_template(self):
@@ -812,8 +810,13 @@ class Flavor(StringIdAPIResourceWrapper):
     @property
     def capacities(self):
         if not hasattr(self, '_capacities'):
-            self._capacities = [Capacity(c) for c in
-                                self._apiresource.capacities]
+            ## FIXME: should we distinguish between tuskar
+            ## capacities and our internal capacities?
+            CapacityStruct = namedtuple('CapacityStruct', 'name value unit')
+            self._capacities = [Capacity(CapacityStruct(
+                        name=c['name'],
+                        value=c['value'],
+                        unit=c['unit'])) for c in self._apiresource.capacities]
         return self._capacities
 
     def capacity(self, capacity_name):