Merge "Fix bug in endpoint group deletion"

Author: Zuul

openstackclient/identity/v3/endpoint_group.py

@@ -204,11 +204,11 @@ def take_action(self, parsed_args):
 
         if endpointgroup:
             # List projects associated to the endpoint group
-            columns = ('ID', 'Name')
+            columns = ('ID', 'Name', 'Description')
             data = client.endpoint_filter.list_projects_for_endpoint_group(
                 endpoint_group=endpointgroup.id)
         elif project:
-            columns = ('ID', 'Name')
+            columns = ('ID', 'Name', 'Description')
             data = client.endpoint_filter.list_endpoint_groups_for_project(
                 project=project.id)
         else:
@@ -251,7 +251,7 @@ def take_action(self, parsed_args):
                                       parsed_args.project,
                                       parsed_args.project_domain)
 
-        client.endpoint_filter.delete_endpoint_group_to_project(
+        client.endpoint_filter.delete_endpoint_group_from_project(
             endpoint_group=endpointgroup.id,
             project=project.id)
 

openstackclient/tests/unit/identity/v3/fakes.py

@@ -235,6 +235,10 @@
     'service_id': service_id,
     'region_id': endpoint_region,
 }
+endpoint_group_filters_2 = {
+    'region_id': endpoint_region,
+}
+endpoint_group_file_path = '/tmp/path/to/file'
 
 ENDPOINT_GROUP = {
     'id': endpoint_group_id,
@@ -1044,6 +1048,64 @@ def create_one_endpoint_filter(attrs=None):
         return endpoint_filter
 
 
+class FakeEndpointGroup(object):
+    """Fake one or more endpoint group."""
+
+    @staticmethod
+    def create_one_endpointgroup(attrs=None):
+        """Create a fake endpoint group.
+
+        :param Dictionary attrs:
+            A dictionary with all attributes
+        :return:
+            A FakeResource object, with id, url, and so on
+        """
+
+        attrs = attrs or {}
+
+        # set default attributes.
+        endpointgroup_info = {
+            'id': 'endpoint-group-id-' + uuid.uuid4().hex,
+            'name': 'endpoint-group-name-' + uuid.uuid4().hex,
+            'filters': {
+                'region': 'region-' + uuid.uuid4().hex,
+                'service_id': 'service-id-' + uuid.uuid4().hex,
+            },
+            'description': 'endpoint-group-description-' + uuid.uuid4().hex,
+            'links': 'links-' + uuid.uuid4().hex,
+        }
+        endpointgroup_info.update(attrs)
+
+        endpoint = fakes.FakeResource(info=copy.deepcopy(endpointgroup_info),
+                                      loaded=True)
+        return endpoint
+
+    @staticmethod
+    def create_one_endpointgroup_filter(attrs=None):
+        """Create a fake endpoint project relationship.
+
+        :param Dictionary attrs:
+            A dictionary with all attributes of endpointgroup filter
+        :return:
+            A FakeResource object with project, endpointgroup and so on
+        """
+        attrs = attrs or {}
+
+        # Set default attribute
+        endpointgroup_filter_info = {
+            'project': 'project-id-' + uuid.uuid4().hex,
+            'endpointgroup': 'endpointgroup-id-' + uuid.uuid4().hex,
+        }
+
+        # Overwrite default attributes if there are some attributes set
+        endpointgroup_filter_info.update(attrs)
+
+        endpointgroup_filter = fakes.FakeModel(
+            copy.deepcopy(endpointgroup_filter_info))
+
+        return endpointgroup_filter
+
+
 class FakeService(object):
     """Fake one or more service."""