Extent Group type according to OpenNebula 4.10 xml documentation - quotas and resource providers pending

michael-os · michael-os · commit df8ff74eb854 · 2015-04-29T21:21:24.000+02:00
diff --git a/oca/group.py b/oca/group.py
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-from pool import Pool, PoolElement
+from pool import Pool, PoolElement, Template
 
 
 class Group(PoolElement):
@@ -12,7 +12,14 @@ class Group(PoolElement):
     XML_TYPES = {
             'id'          : int,
             'name'        : str,
-            'users'       : ['USERS', lambda users: [int(i.text) for i in users]]
+            'template'    : ['TEMPLATE', Template],
+            'users'       : ['USERS', lambda users: [int(i.text) for i in users]],
+            #'resource_providers': handled separately
+            #'datastore_quota': handled separately
+            #'network_quota': handled separately
+            #'vm_quota': handled separately
+            #'image_quota'
+            #'default_group_quotas'
     }
 
     ELEMENT_NAME = 'GROUP'
diff --git a/oca/tests/fixtures/group.xml b/oca/tests/fixtures/group.xml
@@ -1,6 +1,9 @@
 <GROUP>
   <ID>1</ID>
   <NAME>users</NAME>
+  <TEMPLATE>
+    <HELLO>world</HELLO>
+  </TEMPLATE>
   <USERS>
     <ID>1</ID>
     <ID>2</ID>
diff --git a/oca/tests/test_group.py b/oca/tests/test_group.py
@@ -26,3 +26,12 @@ def test_repr(self):
         self.client.call = Mock()
         group = oca.Group(self.xml, self.client)
         assert repr(group) == '<oca.Group("users")>'
+
+    def test_convert_types(self):
+        group = oca.Group(self.xml, None)
+        group._convert_types()
+        assert group.id == 1
+        assert group.name == "users"
+        assert group.template.hello == "world"
+        assert group.users == [1,2]
+
