Merge security groups tests between v2 and v2.1

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 security groups functional tests.

In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server
plugin itself. So os-access-ip extension is enabled to run
merged functional tests for both v2 and v2.1.

Change-Id: I45bc8a6ab4b48bff6ed28b4c779b575252161ed1

doc/api_samples/os-security-groups/security-group-add-post-req.json

@@ -1,5 +0,0 @@
-{
-    "addSecurityGroup" : {
-        "name" : "test"
-    }
-}

doc/api_samples/os-security-groups/security-group-post-req.json

@@ -1,6 +0,0 @@
-{
-    "security_group": {
-        "name": "test",
-        "description": "description"
-    }
-}

doc/api_samples/os-security-groups/security-group-remove-post-req.json

@@ -1,5 +0,0 @@
-{
-    "removeSecurityGroup" : {
-        "name" : "test"
-    }
-}

doc/api_samples/os-security-groups/security-groups-create-resp.json

@@ -1,9 +0,0 @@
-{
-    "security_group": {
-        "description": "description",
-        "id": 2,
-        "name": "test",
-        "rules": [],
-        "tenant_id": "openstack"
-    }
-}

doc/api_samples/os-security-groups/security-groups-get-resp.json

@@ -1,9 +0,0 @@
-{
-    "security_group": {
-        "description": "default",
-        "id": 1,
-        "name": "default",
-        "rules": [],
-        "tenant_id": "openstack"
-    }
-}

doc/api_samples/os-security-groups/security-groups-list-get-resp.json

@@ -1,11 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": 1,
-            "name": "default",
-            "rules": [],
-            "tenant_id": "openstack"
-        }
-    ]
-}

doc/api_samples/os-security-groups/server-post-req.json

@@ -1,16 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}

doc/api_samples/os-security-groups/server-post-resp.json

@@ -1,21 +0,0 @@
-{
-    "server": {
-        "adminPass": "QmKpgBk7izBM",
-        "id": "3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/openstack/servers/3ad37a3a-d5c4-40ab-9bff-af5b66a0e35b",
-                "rel": "bookmark"
-            }
-        ],
-        "security_groups": [
-            {
-                "name": "default"
-            }
-        ]
-    }
-}

doc/api_samples/os-security-groups/server-security-groups-list-resp.json

@@ -1,11 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": 1,
-            "name": "default",
-            "rules": [],
-            "tenant_id": "openstack"
-        }
-    ]
-}

doc/v3/api_samples/os-security-groups/server-get-resp.json

@@ -1,5 +1,7 @@
 {
     "server": {
+        "accessIPv4": "1.2.3.4",
+        "accessIPv6": "80fe::",
         "addresses": {
             "private": [
                 {
@@ -15,7 +17,7 @@
             "id": "1",
             "links": [
                 {
-                    "href": "http://openstack.example.com/flavors/1",
+                    "href": "http://openstack.example.com/openstack/flavors/1",
                     "rel": "bookmark"
                 }
             ]
@@ -26,7 +28,7 @@
             "id": "70a599e0-31e7-49b7-b260-868f441e862b",
             "links": [
                 {
-                    "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
                     "rel": "bookmark"
                 }
             ]
@@ -34,11 +36,11 @@
         "key_name": null,
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
+                "href": "http://openstack.example.com/v2/openstack/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
+                "href": "http://openstack.example.com/openstack/servers/b08eb8d8-db43-44fb-bd89-dfe3302b84ef",
                 "rel": "bookmark"
             }
         ],

doc/v3/api_samples/os-security-groups/server-post-req.json

@@ -1,5 +1,7 @@
 {
     "server" : {
+        "accessIPv4": "1.2.3.4",
+        "accessIPv6": "80fe::",
         "name" : "new-server-test",
         "imageRef" : "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
         "flavorRef" : "http://openstack.example.com/openstack/flavors/1",

doc/v3/api_samples/os-security-groups/server-post-resp.json

@@ -4,11 +4,11 @@
         "id": "60874907-c72b-4a01-805d-54c992510e47",
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/60874907-c72b-4a01-805d-54c992510e47",
+                "href": "http://openstack.example.com/v2/openstack/servers/60874907-c72b-4a01-805d-54c992510e47",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/60874907-c72b-4a01-805d-54c992510e47",
+                "href": "http://openstack.example.com/openstack/servers/60874907-c72b-4a01-805d-54c992510e47",
                 "rel": "bookmark"
             }
         ],

doc/v3/api_samples/os-security-groups/servers-detail-resp.json

@@ -1,6 +1,8 @@
 {
     "servers": [
         {
+            "accessIPv4": "1.2.3.4",
+            "accessIPv6": "80fe::",
             "addresses": {
                 "private": [
                     {
@@ -16,7 +18,7 @@
                 "id": "1",
                 "links": [
                     {
-                        "href": "http://openstack.example.com/flavors/1",
+                        "href": "http://openstack.example.com/openstack/flavors/1",
                         "rel": "bookmark"
                     }
                 ]
@@ -27,7 +29,7 @@
                 "id": "70a599e0-31e7-49b7-b260-868f441e862b",
                 "links": [
                     {
-                        "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+                        "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
                         "rel": "bookmark"
                     }
                 ]
@@ -35,11 +37,11 @@
             "key_name": null,
             "links": [
                 {
-                    "href": "http://openstack.example.com/v3/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
+                    "href": "http://openstack.example.com/v2/openstack/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
                     "rel": "self"
                 },
                 {
-                    "href": "http://openstack.example.com/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
+                    "href": "http://openstack.example.com/openstack/servers/d182742c-6f20-479c-8e32-f79f9c9df6e3",
                     "rel": "bookmark"
                 }
             ],

nova/tests/functional/api_samples/os-security-groups/security-group-add-post-req.json.tpl

@@ -1,5 +0,0 @@
-{
-    "addSecurityGroup" : {
-        "name" : "%(group_name)s"
-    }
-}

nova/tests/functional/api_samples/os-security-groups/security-group-post-req.json.tpl

@@ -1,6 +0,0 @@
-{
-    "security_group": {
-        "name": "%(group_name)s",
-        "description": "description"
-    }
-}

nova/tests/functional/api_samples/os-security-groups/security-group-remove-post-req.json.tpl

@@ -1,5 +0,0 @@
-{
-    "removeSecurityGroup" : {
-        "name" : "%(group_name)s"
-    }
-}

nova/tests/functional/api_samples/os-security-groups/security-groups-create-resp.json.tpl

@@ -1,9 +0,0 @@
-{
-    "security_group": {
-        "description": "description",
-        "id": 2,
-        "name": "%(group_name)s",
-        "rules": [],
-        "tenant_id": "openstack"
-    }
-}

nova/tests/functional/api_samples/os-security-groups/security-groups-get-resp.json.tpl

@@ -1,9 +0,0 @@
-{
-    "security_group": {
-        "description": "default",
-        "id": 1,
-        "name": "default",
-        "rules": [],
-        "tenant_id": "openstack"
-    }
-}

nova/tests/functional/api_samples/os-security-groups/security-groups-list-get-resp.json.tpl

@@ -1,11 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": 1,
-            "name": "default",
-            "rules": [],
-            "tenant_id": "openstack"
-        }
-    ]
-}

nova/tests/functional/api_samples/os-security-groups/server-post-req.json.tpl

@@ -1,16 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "%(host)s/openstack/images/%(image_id)s",
-        "flavorRef" : "%(host)s/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}

nova/tests/functional/api_samples/os-security-groups/server-post-resp.json.tpl

@@ -1,21 +0,0 @@
-{
-    "server": {
-        "adminPass": "%(password)s",
-        "id": "%(id)s",
-        "links": [
-            {
-                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
-                "rel": "self"
-            },
-            {
-                "href": "%(host)s/openstack/servers/%(uuid)s",
-                "rel": "bookmark"
-            }
-        ],
-        "security_groups": [
-            {
-                "name": "default"
-            }
-        ]
-    }
-}

nova/tests/functional/api_samples/os-security-groups/server-security-groups-list-resp.json.tpl

@@ -1,11 +0,0 @@
-{
-    "security_groups": [
-        {
-            "description": "default",
-            "id": 1,
-            "name": "default",
-            "rules": [],
-            "tenant_id": "openstack"
-        }
-    ]
-}

nova/tests/functional/test_api_samples.py

@@ -208,76 +208,6 @@ class LimitsSampleJsonTest(ApiSampleTestBaseV2):
         self._verify_response('limit-get-resp', subs, response, 200)
 
 
-class SecurityGroupsSampleJsonTest(ServersSampleBase):
-    extension_name = "nova.api.openstack.compute.contrib" + \
-                     ".security_groups.Security_groups"
-
-    def _get_create_subs(self):
-        return {
-                'group_name': 'test',
-                "description": "description",
-        }
-
-    def _create_security_group(self):
-        subs = self._get_create_subs()
-        return self._do_post('os-security-groups',
-                             'security-group-post-req', subs)
-
-    def _add_group(self, uuid):
-        subs = {
-                'group_name': 'test'
-        }
-        return self._do_post('servers/%s/action' % uuid,
-                             'security-group-add-post-req', subs)
-
-    def test_security_group_create(self):
-        response = self._create_security_group()
-        subs = self._get_create_subs()
-        self._verify_response('security-groups-create-resp', subs,
-                              response, 200)
-
-    def test_security_groups_list(self):
-        # Get api sample of security groups get list request.
-        response = self._do_get('os-security-groups')
-        subs = self._get_regexes()
-        self._verify_response('security-groups-list-get-resp',
-                              subs, response, 200)
-
-    def test_security_groups_get(self):
-        # Get api sample of security groups get request.
-        security_group_id = '1'
-        response = self._do_get('os-security-groups/%s' % security_group_id)
-        subs = self._get_regexes()
-        self._verify_response('security-groups-get-resp', subs, response, 200)
-
-    def test_security_groups_list_server(self):
-        # Get api sample of security groups for a specific server.
-        uuid = self._post_server(use_common_server_api_samples=False)
-        response = self._do_get('servers/%s/os-security-groups' % uuid)
-        subs = self._get_regexes()
-        self._verify_response('server-security-groups-list-resp',
-                              subs, response, 200)
-
-    def test_security_groups_add(self):
-        self._create_security_group()
-        uuid = self._post_server(use_common_server_api_samples=False)
-        response = self._add_group(uuid)
-        self.assertEqual(response.status_code, 202)
-        self.assertEqual(response.content, '')
-
-    def test_security_groups_remove(self):
-        self._create_security_group()
-        uuid = self._post_server(use_common_server_api_samples=False)
-        self._add_group(uuid)
-        subs = {
-                'group_name': 'test'
-        }
-        response = self._do_post('servers/%s/action' % uuid,
-                                 'security-group-remove-post-req', subs)
-        self.assertEqual(response.status_code, 202)
-        self.assertEqual(response.content, '')
-
-
 class SchedulerHintsJsonTest(ApiSampleTestBaseV2):
     extension_name = ("nova.api.openstack.compute.contrib.scheduler_hints."
                      "Scheduler_hints")

nova/tests/functional/v3/api_samples/os-security-groups/server-get-resp.json.tpl

@@ -1,5 +1,7 @@
 {
     "server": {
+        "accessIPv4": "%(access_ip_v4)s",
+        "accessIPv6": "%(access_ip_v6)s",
         "addresses": {
             "private": [
                 {
@@ -15,7 +17,7 @@
             "id": "1",
             "links": [
                 {
-                    "href": "%(host)s/flavors/1",
+                    "href": "%(host)s/openstack/flavors/1",
                     "rel": "bookmark"
                 }
             ]
@@ -26,18 +28,18 @@
             "id": "%(uuid)s",
             "links": [
                 {
-                    "href": "%(host)s/images/%(uuid)s",
+                    "href": "%(host)s/openstack/images/%(uuid)s",
                     "rel": "bookmark"
                 }
             ]
         },
         "links": [
             {
-                "href": "%(host)s/v3/servers/%(uuid)s",
+                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
                 "rel": "self"
             },
             {
-                "href": "%(host)s/servers/%(uuid)s",
+                "href": "%(host)s/openstack/servers/%(uuid)s",
                 "rel": "bookmark"
             }
         ],

nova/tests/functional/v3/api_samples/os-security-groups/server-post-req.json.tpl

@@ -1,5 +1,7 @@
 {
     "server" : {
+        "accessIPv4": "%(access_ip_v4)s",
+        "accessIPv6": "%(access_ip_v6)s",
         "name" : "new-server-test",
         "imageRef" : "%(glance_host)s/openstack/images/%(image_id)s",
         "flavorRef" : "%(host)s/openstack/flavors/1",

nova/tests/functional/v3/api_samples/os-security-groups/server-post-resp.json.tpl

@@ -4,11 +4,11 @@
         "id": "%(id)s",
         "links": [
             {
-                "href": "http://openstack.example.com/v3/servers/%(uuid)s",
+                "href": "http://openstack.example.com/v2/openstack/servers/%(uuid)s",
                 "rel": "self"
             },
             {
-                "href": "http://openstack.example.com/servers/%(uuid)s",
+                "href": "http://openstack.example.com/openstack/servers/%(uuid)s",
                 "rel": "bookmark"
             }
         ],

nova/tests/functional/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl

@@ -3,6 +3,8 @@
     {
             "updated": "%(isotime)s",
             "created": "%(isotime)s",
+            "accessIPv4": "%(access_ip_v4)s",
+            "accessIPv6": "%(access_ip_v6)s",
             "addresses": {
                 "private": [
                     {
@@ -17,7 +19,7 @@
                 "id": "1",
                 "links": [
                     {
-                        "href": "%(host)s/flavors/1",
+                        "href": "%(host)s/openstack/flavors/1",
                         "rel": "bookmark"
                     }
                 ]
@@ -28,18 +30,18 @@
                 "id": "%(uuid)s",
                 "links": [
                     {
-                        "href": "%(host)s/images/%(uuid)s",
+                        "href": "%(host)s/openstack/images/%(uuid)s",
                         "rel": "bookmark"
                     }
                 ]
             },
             "links": [
                 {
-                    "href": "%(host)s/v3/servers/%(id)s",
+                    "href": "%(host)s/v2/openstack/servers/%(id)s",
                     "rel": "self"
                 },
                 {
-                    "href": "%(host)s/servers/%(id)s",
+                    "href": "%(host)s/openstack/servers/%(id)s",
                     "rel": "bookmark"
                 }
             ],

nova/tests/functional/v3/test_security_groups.py

@@ -13,9 +13,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_config import cfg
+
 from nova.network.security_group import neutron_driver
 from nova.tests.functional.v3 import test_servers
 
+CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension',
+                'nova.api.openstack.compute.extensions')
+
 
 def fake_get(*args, **kwargs):
     nova_group = {}
@@ -59,6 +65,23 @@ def fake_create_security_group(self, context, name, description):
 
 class SecurityGroupsJsonTest(test_servers.ServersSampleBase):
     extension_name = 'os-security-groups'
+    extra_extensions_to_load = ["os-access-ips"]
+    _api_version = 'v2'
+
+    def _get_flags(self):
+        f = super(SecurityGroupsJsonTest, self)._get_flags()
+        f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
+        f['osapi_compute_extension'].append(
+            'nova.api.openstack.compute.contrib.security_groups.'
+            'Security_groups')
+        f['osapi_compute_extension'].append(
+            'nova.api.openstack.compute.contrib.keypairs.Keypairs')
+        f['osapi_compute_extension'].append(
+            'nova.api.openstack.compute.contrib.extended_ips.Extended_ips')
+        f['osapi_compute_extension'].append(
+            'nova.api.openstack.compute.contrib.extended_ips_mac.'
+            'Extended_ips_mac')
+        return f
 
     def setUp(self):
         self.flags(security_group_api=('neutron'))
@@ -91,6 +114,8 @@ class SecurityGroupsJsonTest(test_servers.ServersSampleBase):
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
+        subs['access_ip_v4'] = '1.2.3.4'
+        subs['access_ip_v6'] = '80fe::'
         self._verify_response('server-get-resp', subs, response, 200)
 
     def test_server_detail(self):
@@ -98,6 +123,8 @@ class SecurityGroupsJsonTest(test_servers.ServersSampleBase):
         response = self._do_get('servers/detail')
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
+        subs['access_ip_v4'] = '1.2.3.4'
+        subs['access_ip_v6'] = '80fe::'
         self._verify_response('servers-detail-resp', subs, response, 200)
 
     def _get_create_subs(self):