projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into Azure
[osm/RO.git]
/
osm_ro
/
wim
/
tests
/
fixtures.py
diff --git
a/osm_ro/wim/tests/fixtures.py
b/osm_ro/wim/tests/fixtures.py
index
1b0da4b
..
c39e9d7
100644
(file)
--- a/
osm_ro/wim/tests/fixtures.py
+++ b/
osm_ro/wim/tests/fixtures.py
@@
-121,9
+121,8
@@
def datacenter_account(datacenter, tenant):
def datacenter_tenant_association(datacenter, tenant):
return {'nfvo_tenant_id': uuid('tenant%d' % tenant),
def datacenter_tenant_association(datacenter, tenant):
return {'nfvo_tenant_id': uuid('tenant%d' % tenant),
- 'datacenter_id': uuid('dc%d' % datacenter),
- 'datacenter_tenant_id':
- uuid('dc-account%d%d' % (tenant, datacenter))}
+ 'datacenter_id': uuid('dc%d' % datacenter),
+ 'datacenter_tenant_id': uuid('dc-account%d%d' % (tenant, datacenter))}
def datacenter_set(identifier=0, tenant=0):
def datacenter_set(identifier=0, tenant=0):
@@
-167,7
+166,7
@@
def processed_port_mapping(wim, datacenter,
return {
'wim_id': uuid('wim%d' % wim),
'datacenter_id': uuid('dc%d' % datacenter),
return {
'wim_id': uuid('wim%d' % wim),
'datacenter_id': uuid('dc%d' % datacenter),
- '
wan_pop_port
_mappings': [
+ '
pop_wan
_mappings': [
{'pop_switch_dpid': pop_dpid,
'pop_switch_port': wim + 1 + i,
'wan_service_endpoint_id':
{'pop_switch_dpid': pop_dpid,
'pop_switch_port': wim + 1 + i,
'wan_service_endpoint_id':