Merge pull request #742 from grycap/devel

Change tests to use only 1 pub ip
grycap · Dec 19, 2018 · 79a9f8a · 79a9f8a
2 parents 0bbebfc + 22e892a
commit 79a9f8a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/test/files/test_simple.json b/test/files/test_simple.json
@@ -4,6 +4,10 @@
     "id": "publica",
     "outbound": "yes"
   },
+  {
+    "class": "network",
+    "id": "privada"
+  },
   {
     "class": "system",
     "cpu.arch": "x86_64",
@@ -14,11 +18,29 @@
     "disk.0.os.name": "linux",
     "id": "front",
     "memory.size_min": 536870912,
-    "net_interface.0.connection": "publica"
+    "net_interface.0.connection": "publica",
+    "net_interface.1.connection": "privada"
+  },
+  {
+    "class": "system",
+    "cpu.arch": "x86_64",
+    "cpu.count_min": 1,
+    "disk.0.image.url": "one://ramses.i3m.upv.es/95",
+    "disk.0.os.credentials.password": "yoyoyo",
+    "disk.0.os.credentials.username": "ubuntu",
+    "disk.0.os.name": "linux",
+    "id": "wn",
+    "memory.size_min": 536870912,
+    "net_interface.0.connection": "privada"
   },
   {
     "class": "deploy",
     "system": "front",
     "vm_number": 1
+  },
+  {
+    "class": "deploy",
+    "system": "wn",
+    "vm_number": 1
   }
 ]
diff --git a/test/files/tosca_add.yml b/test/files/tosca_add.yml
@@ -48,9 +48,6 @@ topology_template:
                 protocol: tcp
                 source: 80
       capabilities:
-        scalable:
-          properties:
-           count: 2
         # Host container properties
         host:
          properties:
@@ -96,8 +93,11 @@ topology_template:
             node: db_server
 
     db_server:
-      type: tosca.nodes.Compute
+      type: tosca.nodes.indigo.Compute
       capabilities:
+        scalable:
+          properties:
+           count: 2
         # Host container properties
         host:
          properties:

diff --git a/test/files/tosca_remove.yml b/test/files/tosca_remove.yml
@@ -49,10 +49,6 @@ topology_template:
                 protocol: tcp
                 source: 80
       capabilities:
-        scalable:
-          properties:
-           count: 1
-           removal_list: ['2']
         # Host container properties
         host:
          properties:
@@ -98,8 +94,12 @@ topology_template:
             node: db_server
 
     db_server:
-      type: tosca.nodes.Compute
+      type: tosca.nodes.indigo.Compute
       capabilities:
+        scalable:
+          properties:
+           count: 1
+           removal_list: ['2']
         # Host container properties
         host:
          properties:

diff --git a/test/integration/TestREST_JSON.py b/test/integration/TestREST_JSON.py
@@ -31,8 +31,8 @@
 from radl.radl_json import parse_radl as parse_radl_json
 
 PID = None
-RADL_ADD = """[{"class":"network","reference":true,"id":"publica"},
-{"class":"system","reference":true,"id":"front"},{"vm_number":1,"class":"deploy","system":"front"}]"""
+RADL_ADD = """[{"class":"network","reference":true,"id":"privada"},
+{"class":"system","reference":true,"id":"wn"},{"vm_number":1,"class":"deploy","system":"wn"}]"""
 HOSTNAME = "localhost"
 TEST_PORT = 8800
 
@@ -164,7 +164,7 @@ def test_40_addresource(self):
         self.assertEqual(resp.status_code, 200,
                          msg="ERROR getting the infrastructure info:" + resp.text)
         vm_ids = resp.text.split("\n")
-        self.assertEqual(len(vm_ids), 2, msg=("ERROR getting infrastructure info: Incorrect number of VMs(" +
+        self.assertEqual(len(vm_ids), 3, msg=("ERROR getting infrastructure info: Incorrect number of VMs(" +
                                               str(len(vm_ids)) + "). It must be 2"))
         all_configured = self.wait_inf_state(VirtualMachine.CONFIGURED, 600)
         self.assertTrue(