Update tests for new functionality / OpenNebula 4.10

michael-os · michael-os · commit 7d617395a111 · 2015-04-28T18:52:40.000+02:00
diff --git a/oca/tests/fixtures/host.xml b/oca/tests/fixtures/host.xml
@@ -22,6 +22,13 @@
     <USED_CPU>0</USED_CPU>
     <RUNNING_VMS>3</RUNNING_VMS>
   </HOST_SHARE>
+  <VMS>
+    <ID>82</ID>
+    <ID>84</ID>
+    <ID>85</ID>
+    <ID>95</ID>
+    <ID>96</ID>
+  </VMS>
   <TEMPLATE>
     <CPUSPEED>2.2GHz</CPUSPEED>
     <FREECPU>800</FREECPU>
diff --git a/oca/tests/fixtures/hostpool.xml b/oca/tests/fixtures/hostpool.xml
@@ -24,6 +24,7 @@
       <USED_CPU>0</USED_CPU>
       <RUNNING_VMS>3</RUNNING_VMS>
     </HOST_SHARE>
+    <VMS/>
     <TEMPLATE></TEMPLATE>
   </HOST>
   <HOST>
@@ -51,6 +52,7 @@
       <USED_CPU>0</USED_CPU>
       <RUNNING_VMS>0</RUNNING_VMS>
     </HOST_SHARE>
+    <VMS/>
     <TEMPLATE></TEMPLATE>
   </HOST>
 </HOST_POOL>
diff --git a/oca/tests/fixtures/vm.xml b/oca/tests/fixtures/vm.xml
@@ -45,6 +45,9 @@
         <REQUIREMENTS>MAC="50:20:20:20:20:20"</REQUIREMENTS>
         <VMID>6</VMID>
     </TEMPLATE>
+    <USER_TEMPLATE>
+      <GREETING><![CDATA[Hello World]]></GREETING>
+    </USER_TEMPLATE>
     <HISTORY_RECORDS>
         <HISTORY>
             <SEQ>0</SEQ>
diff --git a/oca/tests/fixtures/vmpool.xml b/oca/tests/fixtures/vmpool.xml
@@ -18,6 +18,7 @@
     <NET_TX>12345</NET_TX>
     <NET_RX>0</NET_RX>
     <TEMPLATE></TEMPLATE>
+    <USER_TEMPLATE/>
     <HISTORY_RECORDS>
         <HISTORY>
           <SEQ>0</SEQ>
@@ -54,6 +55,7 @@
     <NET_TX>12345</NET_TX>
     <NET_RX>0</NET_RX>
     <TEMPLATE></TEMPLATE>
+    <USER_TEMPLATE/>
     <HISTORY_RECORDS>
         <HISTORY>
           <SEQ>0</SEQ>
@@ -90,6 +92,7 @@
     <NET_TX>12345</NET_TX>
     <NET_RX>0</NET_RX>
     <TEMPLATE></TEMPLATE>
+    <USER_TEMPLATE/>
     <HISTORY_RECORDS>
         <HISTORY>
           <SEQ>0</SEQ>
diff --git a/oca/tests/test_client.py b/oca/tests/test_client.py
@@ -17,14 +17,14 @@ def setUp(self):
 
     def test_secret(self):
         c = oca.Client('test:test')
-        assert c.one_auth == 'test:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'
+        assert c.one_auth == 'test:test'
 
     def test_one_auth(self):
         os.environ["ONE_AUTH"] = os.path.join(os.path.dirname(oca.__file__),
                                              'tests/fixtures/one_auth')
         try:
             c = oca.Client()
-            secret = 'test:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'
+            secret = 'test:test'
             assert c.one_auth == secret
         finally:
             os.environ["ONE_AUTH"] = ''
@@ -33,7 +33,7 @@ def test_default_user_path(self):
         os.environ["ONE_AUTH"] = os.path.join(os.path.dirname(oca.__file__),
                                              'tests/fixtures/one_auth')
         c = oca.Client()
-        assert c.one_auth == 'test:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'
+        assert c.one_auth == 'test:test'
 
     @raises(oca.OpenNebulaException)
     def test_wrong_default_user_path(self):
@@ -46,10 +46,6 @@ def test_invalid_secret(self):
                                              'tests/fixtures/one_auth')
         c = oca.Client('testtest')
 
-    def test_with_plain(self):
-        c = oca.Client('test:plain:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3')
-        assert c.one_auth == 'test:a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'
-
     def test_addres(self):
         c = oca.Client('test:test',  "http://8.8.8.8:2633/RPC2")
         assert c.one_address == "http://8.8.8.8:2633/RPC2"
diff --git a/oca/tests/test_host.py b/oca/tests/test_host.py
@@ -46,3 +46,9 @@ def test_host_share_repr(self):
         h._convert_types()
         share = h.host_share
         assert repr(share) == '<oca.vm.HostShare()>'
+
+    def test_host_vm_ids(self):
+        h = oca.Host(self.xml, self.client)
+        h._convert_types()
+        vm_ids = h.vm_ids
+        assert vm_ids == [82,84,85,95,96]
diff --git a/oca/tests/test_virtualmachine.py b/oca/tests/test_virtualmachine.py
@@ -144,3 +144,9 @@ def test_no_history_records_element(self):
         vm.xml.remove(vm.xml.find('HISTORY_RECORDS'))
         vm._convert_types()
         assert vm.history_records == []
+
+    def test_user_template_variables(self):
+        vm = oca.VirtualMachine(self.xml, self.client)
+        vm._convert_types()
+        greeting = vm.user_template.greeting
+        assert greeting == "Hello World"
