x/vmware-nsx
Code Issues Proposed changes

Merge "Rename neutron-id tag to os-neutron-id"

Browse Source
This commit is contained in:
Jenkins 2015-12-09 19:13:50 +00:00 committed by Gerrit Code Review
commit 38612eca2a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/common/utils.py
View File

@ -92,9 +92,9 @@ def build_v3_tags_payload(logical_entity):
""" """
Construct the tags payload that will be pushed to NSX-v3 Construct the tags payload that will be pushed to NSX-v3
Add os-tid:<tenant-id>, os-api-version:<neutron-api-version>, Add os-tid:<tenant-id>, os-api-version:<neutron-api-version>,
neutron-id:<resource-id> os-neutron-id:<resource-id>
""" """
return [{"scope": "neutron-id", return [{"scope": "os-neutron-id",
"tag": logical_entity.get("id", "")}, "tag": logical_entity.get("id", "")},
{"scope": "os-tid", {"scope": "os-tid",
"tag": logical_entity.get("tenant_id", "")}, "tag": logical_entity.get("tenant_id", "")},

2
vmware_nsx/tests/unit/nsx_v3/test_plugin.py
View File

@ -352,7 +352,7 @@ class TestNsxV3Utils(NsxV3PluginTestCaseMixin):
result = utils.build_v3_tags_payload( result = utils.build_v3_tags_payload(
{'id': 'fake_id', {'id': 'fake_id',
'tenant_id': 'fake_tenant_id'}) 'tenant_id': 'fake_tenant_id'})
expected = [{'scope': 'neutron-id', 'tag': 'fake_id'}, expected = [{'scope': 'os-neutron-id', 'tag': 'fake_id'},
{'scope': 'os-tid', 'tag': 'fake_tenant_id'}, {'scope': 'os-tid', 'tag': 'fake_tenant_id'},
{'scope': 'os-api-version', {'scope': 'os-api-version',
'tag': version.version_info.release_string()}] 'tag': version.version_info.release_string()}]