Merge "Use correct device_owner prefix in functional tests"
This commit is contained in:
commit
8fa0663fc7
|
@ -142,7 +142,7 @@ class L3DvrHATestCase(test_l3_dvr_router_plugin.L3DvrTestCase):
|
||||||
arg_list=arg_list,
|
arg_list=arg_list,
|
||||||
**{portbindings.HOST_ID: HOST2}), \
|
**{portbindings.HOST_ID: HOST2}), \
|
||||||
self.port(subnet=subnet3,
|
self.port(subnet=subnet3,
|
||||||
device_owner=constants.DEVICE_OWNER_NEUTRON_PREFIX,
|
device_owner=constants.DEVICE_OWNER_NETWORK_PREFIX,
|
||||||
arg_list=arg_list,
|
arg_list=arg_list,
|
||||||
**{portbindings.HOST_ID: HOST3}):
|
**{portbindings.HOST_ID: HOST3}):
|
||||||
# make net external
|
# make net external
|
||||||
|
|
|
@ -1298,7 +1298,7 @@ class L3DvrTestCase(L3DvrTestCaseBase):
|
||||||
arg_list=arg_list,
|
arg_list=arg_list,
|
||||||
**{portbindings.HOST_ID: HOST2}),\
|
**{portbindings.HOST_ID: HOST2}),\
|
||||||
self.port(subnet=subnet3,
|
self.port(subnet=subnet3,
|
||||||
device_owner=constants.DEVICE_OWNER_NEUTRON_PREFIX,
|
device_owner=constants.DEVICE_OWNER_NETWORK_PREFIX,
|
||||||
arg_list=arg_list,
|
arg_list=arg_list,
|
||||||
**{portbindings.HOST_ID: HOST3}):
|
**{portbindings.HOST_ID: HOST3}):
|
||||||
# make net external
|
# make net external
|
||||||
|
@ -1448,7 +1448,7 @@ class L3DvrTestCase(L3DvrTestCaseBase):
|
||||||
self.port(subnet=subnet2,
|
self.port(subnet=subnet2,
|
||||||
device_owner=constants.DEVICE_OWNER_DHCP) as p2,\
|
device_owner=constants.DEVICE_OWNER_DHCP) as p2,\
|
||||||
self.port(subnet=subnet3,
|
self.port(subnet=subnet3,
|
||||||
device_owner=constants.DEVICE_OWNER_NEUTRON_PREFIX)\
|
device_owner=constants.DEVICE_OWNER_NETWORK_PREFIX)\
|
||||||
as p3,\
|
as p3,\
|
||||||
self.port(subnet=subnet3,
|
self.port(subnet=subnet3,
|
||||||
device_owner=constants.DEVICE_OWNER_COMPUTE_PREFIX)\
|
device_owner=constants.DEVICE_OWNER_COMPUTE_PREFIX)\
|
||||||
|
|
Loading…
Reference in New Issue