Remove 'links' section from several v3 Identity objects

The links field in the returned objects from the v3 Identity
API aren't really useful, so let's remove them.
Managed to remove most of them from the core API.
I'll likely remove the extension/contribution (oauth/federation)
related ones in another patch.

Also in this patch the code for setting services and projects
was changed. Though not incorrect, it was not needed to copy
the entire returned object, we should just need to pass in
the fields we want to update.

Change-Id: I164ca9ad8b28fa10b291e9115ef40753e387c547

3 files changed, 9 insertions, 24 deletions

diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index b0df16f0..8e8c8767 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -18,6 +18,7 @@ import mock
 from openstackclient.tests import fakes
 from openstackclient.tests import utils
 
+base_url = 'http://identity:5000/v3/'
 
 domain_id = 'd1'
 domain_name = 'oftheking'
@@ -28,6 +29,7 @@ DOMAIN = {
     'name': domain_name,
     'description': domain_description,
     'enabled': True,
+    'links': base_url + 'domains/' + domain_id,
 }
 
 group_id = 'gr-010'
@@ -36,6 +38,7 @@ group_name = 'spencer davis'
 GROUP = {
     'id': group_id,
     'name': group_name,
+    'links': base_url + 'groups/' + group_id,
 }
 
 mapping_id = 'test_mapping'
@@ -107,6 +110,7 @@ PROJECT = {
     'description': project_description,
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'projects/' + project_id,
 }
 
 PROJECT_2 = {
@@ -115,6 +119,7 @@ PROJECT_2 = {
     'description': project_description + 'plus four more',
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'projects/' + project_id,
 }
 
 role_id = 'r1'
@@ -123,6 +128,7 @@ role_name = 'roller'
 ROLE = {
     'id': role_id,
     'name': role_name,
+    'links': base_url + 'roles/' + role_id,
 }
 
 service_id = 's-123'
@@ -134,6 +140,7 @@ SERVICE = {
     'name': service_name,
     'type': service_type,
     'enabled': True,
+    'links': base_url + 'services/' + service_id,
 }
 
 endpoint_id = 'e-123'
@@ -148,6 +155,7 @@ ENDPOINT = {
     'interface': endpoint_interface,
     'service_id': service_id,
     'enabled': True,
+    'links': base_url + 'endpoints/' + endpoint_id,
 }
 
 user_id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
@@ -162,6 +170,7 @@ USER = {
     'email': user_email,
     'enabled': True,
     'domain_id': domain_id,
+    'links': base_url + 'users/' + user_id,
 }
 
 token_expires = '2014-01-01T00:00:00Z'
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 2e7bc54b..1060a277 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -533,9 +533,6 @@ class TestProjectSet(TestProject):
 
         # Set expected values
         kwargs = {
-            'description': identity_fakes.project_description,
-            'domain': identity_fakes.domain_id,
-            'enabled': True,
             'name': 'qwerty',
         }
         # ProjectManager.update(project, name=, domain=, description=,
@@ -564,9 +561,6 @@ class TestProjectSet(TestProject):
         # Set expected values
         kwargs = {
             'description': 'new desc',
-            'domain': identity_fakes.domain_id,
-            'enabled': True,
-            'name': identity_fakes.project_name,
         }
         self.projects_mock.update.assert_called_with(
             identity_fakes.project_id,
@@ -590,10 +584,7 @@ class TestProjectSet(TestProject):
 
         # Set expected values
         kwargs = {
-            'description': identity_fakes.project_description,
-            'domain': identity_fakes.domain_id,
             'enabled': True,
-            'name': identity_fakes.project_name,
         }
         self.projects_mock.update.assert_called_with(
             identity_fakes.project_id,
@@ -617,10 +608,7 @@ class TestProjectSet(TestProject):
 
         # Set expected values
         kwargs = {
-            'description': identity_fakes.project_description,
-            'domain': identity_fakes.domain_id,
             'enabled': False,
-            'name': identity_fakes.project_name,
         }
         self.projects_mock.update.assert_called_with(
             identity_fakes.project_id,
@@ -644,10 +632,6 @@ class TestProjectSet(TestProject):
 
         # Set expected values
         kwargs = {
-            'description': identity_fakes.project_description,
-            'domain': identity_fakes.domain_id,
-            'enabled': True,
-            'name': identity_fakes.project_name,
             'fee': 'fi',
             'fo': 'fum',
         }
diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py
index 6733f7fa..57db77b1 100644
--- a/openstackclient/tests/identity/v3/test_service.py
+++ b/openstackclient/tests/identity/v3/test_service.py
@@ -267,9 +267,7 @@ class TestServiceSet(TestService):
 
         # Set expected values
         kwargs = {
-            'name': identity_fakes.service_name,
             'type': identity_fakes.service_type,
-            'enabled': True,
         }
         # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
         self.services_mock.update.assert_called_with(
@@ -297,8 +295,6 @@ class TestServiceSet(TestService):
         # Set expected values
         kwargs = {
             'name': identity_fakes.service_name,
-            'type': identity_fakes.service_type,
-            'enabled': True,
         }
         # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
         self.services_mock.update.assert_called_with(
@@ -325,8 +321,6 @@ class TestServiceSet(TestService):
 
         # Set expected values
         kwargs = {
-            'name': identity_fakes.service_name,
-            'type': identity_fakes.service_type,
             'enabled': True,
         }
         # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
@@ -354,8 +348,6 @@ class TestServiceSet(TestService):
 
         # Set expected values
         kwargs = {
-            'name': identity_fakes.service_name,
-            'type': identity_fakes.service_type,
             'enabled': False,
         }
         # ServiceManager.update(service, name=, type=, enabled=, **kwargs)