Skip to content

Add Parent Field to Resource Manager #2941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 18, 2017
Merged

Add Parent Field to Resource Manager #2941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4741984
Add Parent Field to Resource Manager
Jan 18, 2017
10431b5
make project id string
Jan 18, 2017
d68b4a4
daspemcter review
Jan 18, 2017
f1c6bf2
Dhermes review
Jan 18, 2017
bb2ba9b
trailing commas
Jan 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion resource_manager/google/cloud/resource_manager/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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']

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view


@property
def full_name(self):
Expand Down Expand Up @@ -202,7 +205,12 @@ def update(self, client=None):
"""
client = self._require_client(client)

data = {'name': self.name, 'labels': self.labels}
data = {
'name': self.name,
'labels': self.labels,
'parent': self.parent,
}

resp = client._connection.api_request(
method='PUT', path=self.path, data=data)
self.set_properties_from_api_repr(resp)
Expand Down
33 changes: 32 additions & 1 deletion resource_manager/unit_tests/test_project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -57,18 +59,22 @@ def test_from_api_repr(self):
PROJECT_NUMBER = 12345678
PROJECT_LABELS = {'env': 'prod'}
PROJECT_LIFECYCLE_STATE = 'ACTIVE'
PARENT = {'type': 'organization', 'id': '433637338579'}

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'
Expand All @@ -94,6 +100,10 @@ def test_create(self):
'name': 'Project Name',
'labels': {},
'lifecycleState': 'ACTIVE',
'parent': {
'type': 'organization',
'id': '433637338589',
},
}
connection = _Connection(PROJECT_RESOURCE)
client = _Client(connection=connection)
Expand Down Expand Up @@ -123,6 +133,10 @@ def test_reload(self):
'name': 'Project Name',
'labels': {'env': 'prod'},
'lifecycleState': 'ACTIVE',
'parent': {
'type': 'organization',
'id': '433637338579',
},
}
connection = _Connection(PROJECT_RESOURCE)
client = _Client(connection=connection)
Expand Down Expand Up @@ -197,6 +211,7 @@ def test_update(self):
'data': {
'name': PROJECT_NAME,
'labels': LABELS,
'parent': None,
},
'path': project.path,
}
Expand All @@ -211,6 +226,10 @@ def test_delete_without_reload_data(self):
'name': 'Project Name',
'labels': {'env': 'prod'},
'lifecycleState': 'ACTIVE',
'parent': {
'type': 'organization',
'id': '433637338579',
},
}
connection = _Connection(PROJECT_RESOURCE)
client = _Client(connection=connection)
Expand All @@ -234,6 +253,10 @@ def test_delete_with_reload_data(self):
'name': 'Project Name',
'labels': {'env': 'prod'},
'lifecycleState': 'ACTIVE',
'parent': {
'type': 'organization',
'id': '433637338579',
},
}
DELETING_PROJECT = PROJECT_RESOURCE.copy()
DELETING_PROJECT['lifecycleState'] = NEW_STATE = 'DELETE_REQUESTED'
Expand Down Expand Up @@ -268,6 +291,10 @@ def test_undelete_without_reload_data(self):
'name': 'Project Name',
'labels': {'env': 'prod'},
'lifecycleState': 'DELETE_REQUESTED',
'parent': {
'type': 'organization',
'id': '433637338579',
},
}
connection = _Connection(PROJECT_RESOURCE)
client = _Client(connection=connection)
Expand All @@ -291,6 +318,10 @@ def test_undelete_with_reload_data(self):
'name': 'Project Name',
'labels': {'env': 'prod'},
'lifecycleState': 'DELETE_REQUESTED',
'parent': {
'type': 'organization',
'id': '433637338579',
},
}
UNDELETED_PROJECT = PROJECT_RESOURCE.copy()
UNDELETED_PROJECT['lifecycleState'] = NEW_STATE = 'ACTIVE'
Expand Down