Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

organizations.model.FakeAccount: rename attributes:

Browse Source 
account_id -> id
account_name -> name
This commit is contained in:
Ashley Gould 2018-07-15 18:48:56 -07:00
parent 009dcdb21a
commit 9b5c6c4f0f
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
moto/organizations/models.py
View File

@ -55,8 +55,8 @@ class FakeAccount(BaseModel):
self.organization_id = organization.id self.organization_id = organization.id
self.master_account_id = organization.master_account_id self.master_account_id = organization.master_account_id
self.create_account_status_id = utils.make_random_create_account_status_id() self.create_account_status_id = utils.make_random_create_account_status_id()
self.account_id = utils.make_random_account_id() self.id = utils.make_random_account_id()
self.account_name = kwargs['AccountName'] self.name = kwargs['AccountName']
self.email = kwargs['Email'] self.email = kwargs['Email']
self.create_time = datetime.datetime.utcnow() self.create_time = datetime.datetime.utcnow()
self.status = 'ACTIVE' self.status = 'ACTIVE'
@ -68,7 +68,7 @@ class FakeAccount(BaseModel):
return ACCOUNT_ARN_FORMAT.format( return ACCOUNT_ARN_FORMAT.format(
self.master_account_id, self.master_account_id,
self.organization_id, self.organization_id,
self.account_id self.id
) )
@property @property
@ -76,21 +76,21 @@ class FakeAccount(BaseModel):
return { return {
'CreateAccountStatus': { 'CreateAccountStatus': {
'Id': self.create_account_status_id, 'Id': self.create_account_status_id,
'AccountName': self.account_name, 'AccountName': self.name,
'State': 'SUCCEEDED', 'State': 'SUCCEEDED',
'RequestedTimestamp': unix_time(self.create_time), 'RequestedTimestamp': unix_time(self.create_time),
'CompletedTimestamp': unix_time(self.create_time), 'CompletedTimestamp': unix_time(self.create_time),
'AccountId': self.account_id, 'AccountId': self.id,
} }
} }
def describe(self): def describe(self):
return { return {
'Account': { 'Account': {
'Id': self.account_id, 'Id': self.id,
'Arn': self.arn, 'Arn': self.arn,
'Email': self.email, 'Email': self.email,
'Name': self.account_name, 'Name': self.name,
'Status': self.status, 'Status': self.status,
'JoinedMethod': self.joined_method, 'JoinedMethod': self.joined_method,
'JoinedTimestamp': unix_time(self.create_time), 'JoinedTimestamp': unix_time(self.create_time),
@ -98,6 +98,33 @@ class FakeAccount(BaseModel):
} }
class FakeOrganizationalUnit(BaseModel):
def __init__(self, organization, root_id, **kwargs):
self.organization_id = organization.id
self.master_account_id = organization.master_account_id
self.id = utils.make_random_ou_id(root_id)
self.name = kwargs['Name']
self.parent_id = kwargs['ParentId']
@property
def arn(self):
return OU_ARN_FORMAT.format(
self.master_account_id,
self.organization_id,
self.id
)
def describe(self):
return {
'OrganizationalUnit': {
'Id': self.id,
'Arn': self.arn,
'Name': self.name,
}
}
class FakeRoot(BaseModel): class FakeRoot(BaseModel):
def __init__(self, organization, **kwargs): def __init__(self, organization, **kwargs):
@ -127,32 +154,6 @@ class FakeRoot(BaseModel):
} }
class FakeOrganizationalUnit(BaseModel):
def __init__(self, organization, root_id, **kwargs):
self.organization_id = organization.id
self.master_account_id = organization.master_account_id
self.id = utils.make_random_ou_id(root_id)
self.name = kwargs['Name']
self.parent_id = kwargs['ParentId']
@property
def arn(self):
return OU_ARN_FORMAT.format(
self.master_account_id,
self.organization_id,
self.id
)
def describe(self):
return {
'OrganizationalUnit': {
'Id': self.id,
'Arn': self.arn,
'Name': self.name,
}
}
class OrganizationsBackend(BaseBackend): class OrganizationsBackend(BaseBackend):
@ -223,7 +224,7 @@ class OrganizationsBackend(BaseBackend):
def describe_account(self, **kwargs): def describe_account(self, **kwargs):
account = [ account = [
account for account in self.accounts account for account in self.accounts
if account.account_id == kwargs['AccountId'] if account.id == kwargs['AccountId']
].pop(0) ].pop(0)
return account.describe() return account.describe()
@ -245,7 +246,7 @@ class OrganizationsBackend(BaseBackend):
new_parent_id = kwargs['DestinationParentId'] new_parent_id = kwargs['DestinationParentId']
all_parent_id = [parent.id for parent in self.roots + self.ou] all_parent_id = [parent.id for parent in self.roots + self.ou]
account = [ account = [
account for account in self.accounts if account.account_id == kwargs['AccountId'] account for account in self.accounts if account.id == kwargs['AccountId']
].pop(0) ].pop(0)
assert new_parent_id in all_parent_id assert new_parent_id in all_parent_id
assert account.parent_id == kwargs['SourceParentId'] assert account.parent_id == kwargs['SourceParentId']