Merge "remove url from v3 regions"

3 files changed, 9 insertions, 94 deletions

diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py
index eb4c084c..1ff0b8c0 100644
--- a/openstackclient/identity/v3/region.py
+++ b/openstackclient/identity/v3/region.py
@@ -48,12 +48,6 @@ class CreateRegion(show.ShowOne):
             metavar='<description>',
             help=_('New region description'),
         )
-        parser.add_argument(
-            '--url',
-            metavar='<url>',
-            help=_('New region url'),
-        )
-
         return parser
 
     @utils.log_method(log)
@@ -62,7 +56,6 @@ class CreateRegion(show.ShowOne):
 
         region = identity_client.regions.create(
             id=parsed_args.region,
-            url=parsed_args.url,
             parent_region=parsed_args.parent_region,
             description=parsed_args.description,
         )
@@ -117,8 +110,8 @@ class ListRegion(lister.Lister):
         if parsed_args.parent_region:
             kwargs['parent_region_id'] = parsed_args.parent_region
 
-        columns_headers = ('Region', 'Parent Region', 'Description', 'URL')
-        columns = ('ID', 'Parent Region Id', 'Description', 'URL')
+        columns_headers = ('Region', 'Parent Region', 'Description')
+        columns = ('ID', 'Parent Region Id', 'Description')
 
         data = identity_client.regions.list(**kwargs)
         return (columns_headers,
@@ -150,25 +143,16 @@ class SetRegion(command.Command):
             metavar='<description>',
             help=_('New region description'),
         )
-        parser.add_argument(
-            '--url',
-            metavar='<url>',
-            help=_('New region url'),
-        )
         return parser
 
     @utils.log_method(log)
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.url
-                and not parsed_args.parent_region
-                and not parsed_args.description):
+        if not parsed_args.parent_region and not parsed_args.description:
             return
 
         kwargs = {}
-        if parsed_args.url:
-            kwargs['url'] = parsed_args.url
         if parsed_args.description:
             kwargs['description'] = parsed_args.description
         if parsed_args.parent_region:
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 9c4de9cc..ff267478 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -123,13 +123,11 @@ PROJECT_2 = {
 }
 
 region_id = 'region_one'
-region_url = 'http://localhost:1111'
 region_parent_region_id = 'region_two'
 region_description = 'region one'
 
 REGION = {
     'id': region_id,
-    'url': region_url,
     'description': region_description,
     'parent_region_id': region_parent_region_id,
     'links': base_url + 'regions/' + region_id,
diff --git a/openstackclient/tests/identity/v3/test_region.py b/openstackclient/tests/identity/v3/test_region.py
index 7f6ced9f..0ebbbecf 100644
--- a/openstackclient/tests/identity/v3/test_region.py
+++ b/openstackclient/tests/identity/v3/test_region.py
@@ -61,19 +61,17 @@ class TestRegionCreate(TestRegion):
             'description': identity_fakes.region_description,
             'id': identity_fakes.region_id,
             'parent_region': None,
-            'url': None,
         }
         self.regions_mock.create.assert_called_with(
             **kwargs
         )
 
-        collist = ('description', 'parent_region', 'region', 'url')
+        collist = ('description', 'parent_region', 'region')
         self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.region_description,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_id,
-            identity_fakes.region_url,
         )
         self.assertEqual(datalist, data)
 
@@ -94,19 +92,17 @@ class TestRegionCreate(TestRegion):
             'description': None,
             'id': identity_fakes.region_id,
             'parent_region': None,
-            'url': None,
         }
         self.regions_mock.create.assert_called_with(
             **kwargs
         )
 
-        collist = ('description', 'parent_region', 'region', 'url')
+        collist = ('description', 'parent_region', 'region')
         self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.region_description,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_id,
-            identity_fakes.region_url,
         )
         self.assertEqual(datalist, data)
 
@@ -129,54 +125,17 @@ class TestRegionCreate(TestRegion):
             'description': None,
             'id': identity_fakes.region_id,
             'parent_region': identity_fakes.region_parent_region_id,
-            'url': None,
         }
         self.regions_mock.create.assert_called_with(
             **kwargs
         )
 
-        collist = ('description', 'parent_region', 'region', 'url')
+        collist = ('description', 'parent_region', 'region')
         self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.region_description,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_id,
-            identity_fakes.region_url,
-        )
-        self.assertEqual(datalist, data)
-
-    def test_region_create_url(self):
-        arglist = [
-            identity_fakes.region_id,
-            '--url', identity_fakes.region_url,
-        ]
-        verifylist = [
-            ('region', identity_fakes.region_id),
-            ('url', identity_fakes.region_url),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # DisplayCommandBase.take_action() returns two tuples
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'description': None,
-            'id': identity_fakes.region_id,
-            'parent_region': None,
-            'url': identity_fakes.region_url,
-        }
-        self.regions_mock.create.assert_called_with(
-            **kwargs
-        )
-
-        collist = ('description', 'parent_region', 'region', 'url')
-        self.assertEqual(collist, columns)
-        datalist = (
-            identity_fakes.region_description,
-            identity_fakes.region_parent_region_id,
-            identity_fakes.region_id,
-            identity_fakes.region_url,
         )
         self.assertEqual(datalist, data)
 
@@ -233,13 +192,12 @@ class TestRegionList(TestRegion):
         columns, data = self.cmd.take_action(parsed_args)
         self.regions_mock.list.assert_called_with()
 
-        collist = ('Region', 'Parent Region', 'Description', 'URL')
+        collist = ('Region', 'Parent Region', 'Description')
         self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.region_id,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_description,
-            identity_fakes.region_url,
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -257,13 +215,12 @@ class TestRegionList(TestRegion):
         self.regions_mock.list.assert_called_with(
             parent_region_id=identity_fakes.region_parent_region_id)
 
-        collist = ('Region', 'Parent Region', 'Description', 'URL')
+        collist = ('Region', 'Parent Region', 'Description')
         self.assertEqual(collist, columns)
         datalist = ((
             identity_fakes.region_id,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_description,
-            identity_fakes.region_url,
         ), )
         self.assertEqual(datalist, tuple(data))
 
@@ -319,29 +276,6 @@ class TestRegionSet(TestRegion):
             **kwargs
         )
 
-    def test_region_set_url(self):
-        arglist = [
-            '--url', 'new url',
-            identity_fakes.region_id,
-        ]
-        verifylist = [
-            ('url', 'new url'),
-            ('region', identity_fakes.region_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        result = self.cmd.run(parsed_args)
-        self.assertEqual(0, result)
-
-        # Set expected values
-        kwargs = {
-            'url': 'new url',
-        }
-        self.regions_mock.update.assert_called_with(
-            identity_fakes.region_id,
-            **kwargs
-        )
-
     def test_region_set_parent_region_id(self):
         arglist = [
             '--parent-region', 'new_parent',
@@ -395,12 +329,11 @@ class TestRegionShow(TestRegion):
             identity_fakes.region_id,
         )
 
-        collist = ('description', 'parent_region', 'region', 'url')
+        collist = ('description', 'parent_region', 'region')
         self.assertEqual(collist, columns)
         datalist = (
             identity_fakes.region_description,
             identity_fakes.region_parent_region_id,
             identity_fakes.region_id,
-            identity_fakes.region_url,
         )
         self.assertEqual(datalist, data)