This repository has been archived by the owner on Nov 9, 2020. It is now read-only.
Rename tenant to vm group.liping #1021
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test: |
|
@msterin @shaominchen Please review it. |
I think yes. |
msterin
approved these changes
Mar 10, 2017
|
|
||
| def test_tenant_create(self): | ||
| args = self.parser.parse_args('tenant create --name=tenant1 --vm-list vm1,vm2'.split()) | ||
| args = self.parser.parse_args('vm-group create --name=vm-group1 --vm-list vm1,vm2'.split()) |
There was a problem hiding this comment.
I do not think there was a need to change the names of groups in the test. (no need to roll back though )
| self.assertEqual(args.vm_list, ['vm1', 'vm2']) | ||
|
|
||
| def test_tenant_create_missing_option_fails(self): | ||
| self.assert_parse_error('tenant create') | ||
| self.assert_parse_error('vm-group create') |
There was a problem hiding this comment.
I think it would be much better to have a global definition and use a VMGROUP name everywhere.
So this line would be self.assert_parse_error(VMGROUP + ' create')
This comment applies to ALL changes.
shaominchen
approved these changes
Mar 11, 2017
docs/user-guide/admin-cli.md
Outdated
|
|
||
| Sample: | ||
| ``` | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py tenant rm --name=tenant1 --remove-volumes | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py vm-group rm --name=new-vm-group1 --remove-volumes |
There was a problem hiding this comment.
Nit: new-vm-group1 => vm-group1
docs/user-guide/admin-cli.md
Outdated
| 564df562-3d58-c99a-e76e-e8792b77ca2d photon4 | ||
| 564d4728-f1c7-2029-d01e-51f5e6536cd9 photon5 | ||
| ------------------------------------ -------- | ||
| 564d5849-b135-1259-cc73-d2d3aa1d9b8c photon-6 |
There was a problem hiding this comment.
Can we keep the name consistent? Either photon-6 and photon-7, or photon6 and photon7. Same for other occurrences.
docs/user-guide/admin-cli.md
Outdated
|
|
||
| Sample: | ||
|
|
||
| ```shell | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py tenant access ls --name=tenant1 | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py vm-group access ls --name=vm-group1 |
There was a problem hiding this comment.
Nit: remove one redundant space
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py tenant access set --name=tenant1 --datastore=datastore1 --allow-create --volume-maxsize=1000MB --volume-totalsize=2GB | ||
| tenant access set succeeded | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py tenant access ls --name=tenant1 | ||
| [root@localhost:~] /usr/lib/vmware/vmdkops/bin/vmdkops_admin.py vm-group access set --name=vm-group1 --datastore=datastore1 --allow-create=True --volume-maxsize=1000MB --volume-totalsize=2GB |
docs/user-guide/faq.md
Outdated
| ``` | ||
|
|
||
| After this point, the manually upgrade is done, and tenancy operations will succeed. | ||
|
|
||
| #### Case2: Has tenant configured before | ||
| #### Case2: Has vm-group configured before |
| @@ -102,56 +103,64 @@ Step 2: Move the auth-db file at /etc/vmware/vmdkops/auth-db | |||
| [root@localhost:/etc/vmware/vmdkops]mv /etc/vmware/vmdkops/auth-db /etc/vmware/vmdkops/auth-db.backup.v10.upgrade | |||
| ``` | |||
|
|
|||
| Step 3: Verify “tenant ls” command, now only ```_DEFAULT``` should be listed. | |||
| Step 3: Verify “vm-group ls” command, now only ```_DEFAULT``` should be listed. | |||
lipingxue
force-pushed
the
rename_tenant_to_vm_group.liping
branch
from
8ac7e4a
to
954562b
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR includes:
Most function name and DB schema remain unchanged.
Currently, "tenant" is still used in logging, I am not sure whether we should change it or not. Any comments?