Add Parent Field to Resource Manager

Author: Bill Prin

resource_manager/google/cloud/resource_manager/project.py

@@ -58,6 +58,7 @@ def __init__(self, project_id, client, name=None, labels=None):
         self.number = None
         self.labels = labels or {}
         self.status = None
+        self.parent = None
 
     def __repr__(self):
         return '<Project: %r (%r)>' % (self.name, self.project_id)
@@ -85,6 +86,8 @@ def set_properties_from_api_repr(self, resource):
         self.number = resource['projectNumber']
         self.labels = resource.get('labels', {})
         self.status = resource['lifecycleState']
+        if 'parent' in resource:
+            self.parent = resource['parent']
 
     @property
     def full_name(self):
@@ -202,7 +205,16 @@ def update(self, client=None):
         """
         client = self._require_client(client)
 
-        data = {'name': self.name, 'labels': self.labels}
+        data = {}
+        if self.name:
+            data['name'] = self.name
+
+        if self.labels:
+            data['labels'] = self.labels
+
+        if self.parent:
+            data['parent'] = self.parent
+
         resp = client._connection.api_request(
             method='PUT', path=self.path, data=data)
         self.set_properties_from_api_repr(resp)

resource_manager/unit_tests/test_project.py

@@ -35,6 +35,7 @@ def test_constructor_defaults(self):
         self.assertIsNone(project.number)
         self.assertEqual(project.labels, {})
         self.assertIsNone(project.status)
+        self.assertIsNone(project.parent)
 
     def test_constructor_explicit(self):
         client = object()
@@ -49,6 +50,7 @@ def test_constructor_explicit(self):
         self.assertIsNone(project.number)
         self.assertEqual(project.labels, LABELS)
         self.assertIsNone(project.status)
+        self.assertIsNone(project.parent)
 
     def test_from_api_repr(self):
         client = object()
@@ -57,18 +59,23 @@ def test_from_api_repr(self):
         PROJECT_NUMBER = 12345678
         PROJECT_LABELS = {'env': 'prod'}
         PROJECT_LIFECYCLE_STATE = 'ACTIVE'
+        PARENT = {'type': 'organization', 'id': 433637338589}
+
         resource = {'projectId': PROJECT_ID,
                     'name': PROJECT_NAME,
                     'projectNumber': PROJECT_NUMBER,
                     'labels': PROJECT_LABELS,
-                    'lifecycleState': PROJECT_LIFECYCLE_STATE}
+                    'lifecycleState': PROJECT_LIFECYCLE_STATE,
+                    'parent': PARENT
+                    }
         project = self._get_target_class().from_api_repr(resource, client)
         self.assertEqual(project.project_id, PROJECT_ID)
         self.assertEqual(project._client, client)
         self.assertEqual(project.name, PROJECT_NAME)
         self.assertEqual(project.number, PROJECT_NUMBER)
         self.assertEqual(project.labels, PROJECT_LABELS)
         self.assertEqual(project.status, PROJECT_LIFECYCLE_STATE)
+        self.assertEqual(project.parent, PARENT)
 
     def test_full_name(self):
         PROJECT_ID = 'project-id'
@@ -94,6 +101,10 @@ def test_create(self):
             'name': 'Project Name',
             'labels': {},
             'lifecycleState': 'ACTIVE',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         connection = _Connection(PROJECT_RESOURCE)
         client = _Client(connection=connection)
@@ -123,6 +134,10 @@ def test_reload(self):
             'name': 'Project Name',
             'labels': {'env': 'prod'},
             'lifecycleState': 'ACTIVE',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         connection = _Connection(PROJECT_RESOURCE)
         client = _Client(connection=connection)
@@ -183,6 +198,10 @@ def test_update(self):
             'name': PROJECT_NAME,
             'labels': LABELS,
             'lifecycleState': 'ACTIVE',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         connection = _Connection(PROJECT_RESOURCE)
         client = _Client(connection=connection)
@@ -211,6 +230,10 @@ def test_delete_without_reload_data(self):
             'name': 'Project Name',
             'labels': {'env': 'prod'},
             'lifecycleState': 'ACTIVE',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         connection = _Connection(PROJECT_RESOURCE)
         client = _Client(connection=connection)
@@ -234,6 +257,10 @@ def test_delete_with_reload_data(self):
             'name': 'Project Name',
             'labels': {'env': 'prod'},
             'lifecycleState': 'ACTIVE',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         DELETING_PROJECT = PROJECT_RESOURCE.copy()
         DELETING_PROJECT['lifecycleState'] = NEW_STATE = 'DELETE_REQUESTED'
@@ -268,6 +295,10 @@ def test_undelete_without_reload_data(self):
             'name': 'Project Name',
             'labels': {'env': 'prod'},
             'lifecycleState': 'DELETE_REQUESTED',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         connection = _Connection(PROJECT_RESOURCE)
         client = _Client(connection=connection)
@@ -291,6 +322,10 @@ def test_undelete_with_reload_data(self):
             'name': 'Project Name',
             'labels': {'env': 'prod'},
             'lifecycleState': 'DELETE_REQUESTED',
+            'parent': {
+                'type': 'organization',
+                'id': 433637338589
+            }
         }
         UNDELETED_PROJECT = PROJECT_RESOURCE.copy()
         UNDELETED_PROJECT['lifecycleState'] = NEW_STATE = 'ACTIVE'