Merge V2 and V2.1 floating ips functional tests

Currently v2 and v2.1 have separate functional tests and their corresponding sample files. As v2 and v2.1 are supposed to be identical, there is overhead to maintain two set of functional tests and sample files. We can have one set of tests which can run for both v2 and v2.1. This commit merges all floating ip functional tests. Below APIs tests are megred- -floating_ip_dns -floating-ips-bulk -floating-ips -floating-ip-pools Change-Id: Ibde0b152949559dec90ea0e7ee6668ab05b4927f
2015-03-25 15:42:35 +09:00
parent 20c47ea3d5
commit d98aa4fadc
44 changed files with 62 additions and 607 deletions
@@ -1,6 +0,0 @@
-{
-  "dns_entry": {
-    "ip": "192.168.53.11",
-    "dns_type": "A"
-  }
-}
@@ -1,9 +0,0 @@
-{
-    "dns_entry": {
-        "domain": "domain1.example.org",
-        "id": null,
-        "ip": "192.168.1.1",
-        "name": "instance1",
-        "type": "A"
-    }
-}
@@ -1,7 +0,0 @@
-{
-  "domain_entry": {
-    "domain": "domain1.example.org",
-    "scope": "public",
-    "project": "project1"
-  }
-}
@@ -1,8 +0,0 @@
-{
-    "domain_entry": {
-        "availability_zone": null,
-        "domain": "domain1.example.org",
-        "project": "project1",
-        "scope": "public"
-    }
-}
@@ -1,9 +0,0 @@
-{
-    "dns_entry": {
-        "domain": "domain1.example.org",
-        "id": null,
-        "ip": "192.168.1.1",
-        "name": "instance1",
-        "type": null
-    }
-}
@@ -1,11 +0,0 @@
-{
-    "dns_entries": [
-        {
-            "domain": "domain1.example.org",
-            "id": null,
-            "ip": "192.168.1.1",
-            "name": "instance1",
-            "type": null
-        }
-    ]
-}
@@ -1,10 +0,0 @@
-{
-    "domain_entries": [
-        {
-            "availability_zone": null,
-            "domain": "domain1.example.org",
-            "project": "project1",
-            "scope": "public"
-        }
-    ]
-}