diff options
Diffstat (limited to 'neutron/tests/functional/plugins/ml2/drivers')
5 files changed, 40 insertions, 31 deletions
diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/test_qos.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/test_qos.py index 85f33b6276..8edcf60b11 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/test_qos.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/extensions/test_qos.py @@ -226,6 +226,7 @@ class TestOVNClientQosExtensionEndToEnd(TestOVNClientQosExtensionBase): arg_list = arg_list + (pnet.PHYSICAL_NETWORK,) net_arg[pnet.PHYSICAL_NETWORK] = physnet network = self._make_network(self.fmt, name, True, + as_admin=True, arg_list=arg_list, **net_arg) if cidr: self._make_subnet(self.fmt, network, gateway, cidr, diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py index 6a23b3cc32..a4111d453a 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_maintenance.py @@ -55,9 +55,9 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): return row def _create_network(self, name, external=False): - data = {'network': {'name': name, 'tenant_id': self._tenant_id, - extnet_apidef.EXTERNAL: external}} - req = self.new_create_request('networks', data, self.fmt) + data = {'network': {'name': name, extnet_apidef.EXTERNAL: external}} + req = self.new_create_request('networks', data, self.fmt, + as_admin=True) res = req.get_response(self.api) return self.deserialize(self.fmt, res)['network'] @@ -70,7 +70,6 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): def _create_port(self, name, net_id, security_groups=None, device_owner=None): data = {'port': {'name': name, - 'tenant_id': self._tenant_id, 'network_id': net_id}} if security_groups is not None: @@ -125,7 +124,6 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): data = {'subnet': {'name': name, 'network_id': net_id, 'ip_version': ip_version, - 'tenant_id': self._tenant_id, 'cidr': cidr, 'enable_dhcp': True}} data['subnet'].update(kwargs) @@ -146,10 +144,13 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): return row def _create_router(self, name, external_gateway_info=None): - data = {'router': {'name': name, 'tenant_id': self._tenant_id}} + data = {'router': {'name': name}} + as_admin = False if external_gateway_info is not None: data['router']['external_gateway_info'] = external_gateway_info - req = self.new_create_request('routers', data, self.fmt) + as_admin = bool(external_gateway_info.get('enable_snat')) + req = self.new_create_request('routers', data, self.fmt, + as_admin=as_admin) res = req.get_response(self.api) return self.deserialize(self.fmt, res)['router'] @@ -167,7 +168,6 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): def _create_security_group(self): data = {'security_group': {'name': 'sgtest', - 'tenant_id': self._tenant_id, 'description': 'SpongeBob Rocks!'}} req = self.new_create_request('security-groups', data, self.fmt) res = req.get_response(self.api) @@ -183,8 +183,7 @@ class _TestMaintenanceHelper(base.TestOVNFunctionalBase): 'protocol': n_const.PROTO_NAME_TCP, 'ethertype': n_const.IPv4, 'port_range_min': 22, - 'port_range_max': 22, - 'tenant_id': self._tenant_id}} + 'port_range_max': 22}} req = self.new_create_request('security-group-rules', data, self.fmt) res = req.get_response(self.api) return self.deserialize(self.fmt, res)['security_group_rule'] @@ -772,8 +771,8 @@ class TestMaintenance(_TestMaintenanceHelper): p1 = self._create_port('testp1', net1['id']) logical_ip = p1['fixed_ips'][0]['ip_address'] fip_info = {'floatingip': { - 'description': 'test_fip', 'tenant_id': self._tenant_id, + 'description': 'test_fip', 'floating_network_id': ext_net['id'], 'port_id': p1['id'], 'fixed_ip_address': logical_ip}} diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py index 892280f3bc..67aee6ba9a 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovn_db_sync.py @@ -365,7 +365,7 @@ class TestOvnNbSync(base.TestOVNFunctionalBase): port_req.get_response(self.api) # External network and subnet - e1 = self._make_network(self.fmt, 'e1', True, + e1 = self._make_network(self.fmt, 'e1', True, as_admin=True, arg_list=('router:external', 'provider:network_type', 'provider:physical_network'), @@ -1608,20 +1608,23 @@ class TestOvnNbSync(base.TestOVNFunctionalBase): net = self.deserialize(self.fmt, res)['network'] self._create_subnet(self.fmt, net['id'], '10.0.0.0/24') - res = self._create_qos_policy(self.fmt, 'qos_maxbw') + res = self._create_qos_policy(self.fmt, 'qos_maxbw', is_admin=True) qos_maxbw = self.deserialize(self.fmt, res)['policy'] self._create_qos_rule(self.fmt, qos_maxbw['id'], qos_const.RULE_TYPE_BANDWIDTH_LIMIT, - max_kbps=1000, max_burst_kbps=800) + max_kbps=1000, max_burst_kbps=800, + is_admin=True) self._create_qos_rule(self.fmt, qos_maxbw['id'], qos_const.RULE_TYPE_BANDWIDTH_LIMIT, direction=constants.INGRESS_DIRECTION, - max_kbps=700, max_burst_kbps=600) + max_kbps=700, max_burst_kbps=600, + is_admin=True) - res = self._create_qos_policy(self.fmt, 'qos_maxbw') + res = self._create_qos_policy(self.fmt, 'qos_maxbw', is_admin=True) qos_dscp = self.deserialize(self.fmt, res)['policy'] self._create_qos_rule(self.fmt, qos_dscp['id'], - qos_const.RULE_TYPE_DSCP_MARKING, dscp_mark=14) + qos_const.RULE_TYPE_DSCP_MARKING, dscp_mark=14, + is_admin=True) res = self._create_port( self.fmt, net['id'], arg_list=('qos_policy_id', ), @@ -1677,7 +1680,7 @@ class TestOvnNbSync(base.TestOVNFunctionalBase): {'floatingip': body}) def test_sync_fip_qos_policies(self): - res = self._create_network(self.fmt, 'n1_ext', True, + res = self._create_network(self.fmt, 'n1_ext', True, as_admin=True, arg_list=('router:external', ), **{'router:external': True}) net_ext = self.deserialize(self.fmt, res)['network'] @@ -1687,15 +1690,17 @@ class TestOvnNbSync(base.TestOVNFunctionalBase): net_int = self.deserialize(self.fmt, res)['network'] self._create_subnet(self.fmt, net_int['id'], '10.10.0.0/24') - res = self._create_qos_policy(self.fmt, 'qos_maxbw') + res = self._create_qos_policy(self.fmt, 'qos_maxbw', is_admin=True) qos_maxbw = self.deserialize(self.fmt, res)['policy'] self._create_qos_rule(self.fmt, qos_maxbw['id'], qos_const.RULE_TYPE_BANDWIDTH_LIMIT, - max_kbps=1000, max_burst_kbps=800) + max_kbps=1000, max_burst_kbps=800, + is_admin=True) self._create_qos_rule(self.fmt, qos_maxbw['id'], qos_const.RULE_TYPE_BANDWIDTH_LIMIT, direction=constants.INGRESS_DIRECTION, - max_kbps=700, max_burst_kbps=600) + max_kbps=700, max_burst_kbps=600, + is_admin=True) # Create a router with net_ext as GW network and net_int as internal # one, and a floating IP on the external network. @@ -1750,7 +1755,7 @@ class TestOvnNbSync(base.TestOVNFunctionalBase): self._validate_qos_records() def test_fip_nat_revert_to_stateful(self): - res = self._create_network(self.fmt, 'n1_ext', True, + res = self._create_network(self.fmt, 'n1_ext', True, as_admin=True, arg_list=('router:external', ), **{'router:external': True}) net_ext = self.deserialize(self.fmt, res)['network'] diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py index 5a6073cfb2..1eea038c01 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/ovsdb/test_ovsdb_monitor.py @@ -103,12 +103,13 @@ class TestNBDbMonitor(base.TestOVNFunctionalBase): allowedaddresspairs.ADDRESS_PAIRS: allowed_address_pairs } port_res = self._create_port(self.fmt, self.net['network']['id'], + is_admin=True, arg_list=arg_list, **host_arg) port = self.deserialize(self.fmt, port_res)['port'] return port def _create_fip(self, port, fip_address): - e1 = self._make_network(self.fmt, 'e1', True, + e1 = self._make_network(self.fmt, 'e1', True, as_admin=True, arg_list=('router:external', 'provider:network_type', 'provider:physical_network'), @@ -403,7 +404,8 @@ class TestSBDbMonitor(base.TestOVNFunctionalBase, test_l3.L3NatTestCaseMixin): kwargs = {'arg_list': (external_net.EXTERNAL,), external_net.EXTERNAL: True} - ext_net = self._make_network(self.fmt, 'ext_net', True, **kwargs) + ext_net = self._make_network(self.fmt, 'ext_net', True, as_admin=True, + **kwargs) self._make_subnet(self.fmt, ext_net, '10.251.0.1', '10.251.0.0/24', enable_dhcp=True) router = self._make_router(self.fmt, self._tenant_id) diff --git a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py index ee92f68dbd..e1abd67c8e 100644 --- a/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py +++ b/neutron/tests/functional/plugins/ml2/drivers/ovn/mech_driver/test_mech_driver.py @@ -101,20 +101,21 @@ class TestPortBinding(base.TestOVNFunctionalBase): 'network_id': self.n1['network']['id'], 'tenant_id': self._tenant_id}) - port_req = self.new_create_request('ports', port_data, self.fmt) + port_req = self.new_create_request('ports', port_data, self.fmt, + as_admin=True) port_res = port_req.get_response(self.api) p = self.deserialize(self.fmt, port_res) port_id = p['port']['id'] else: port_req = self.new_update_request('ports', port_data, port_id, - self.fmt) + self.fmt, as_admin=True) port_res = port_req.get_response(self.api) self.deserialize(self.fmt, port_res) return port_id def _port_show(self, port_id): - port_req = self.new_show_request('ports', port_id) + port_req = self.new_show_request('ports', port_id, as_admin=True) port_res = port_req.get_response(self.api) return self.deserialize(self.fmt, port_res) @@ -715,13 +716,13 @@ class TestExternalPorts(base.TestOVNFunctionalBase): def _test_external_port_create_switchdev(self, vnic_type): port_data = { 'port': {'network_id': self.n1['network']['id'], - 'tenant_id': self._tenant_id, portbindings.VNIC_TYPE: vnic_type, ovn_const.OVN_PORT_BINDING_PROFILE: { ovn_const.PORT_CAP_PARAM: [ ovn_const.PORT_CAP_SWITCHDEV]}}} - port_req = self.new_create_request('ports', port_data, self.fmt) + port_req = self.new_create_request('ports', port_data, self.fmt, + as_admin=True) port_res = port_req.get_response(self.api) port = self.deserialize(self.fmt, port_res)['port'] @@ -769,7 +770,8 @@ class TestExternalPorts(base.TestOVNFunctionalBase): ovn_const.PORT_CAP_PARAM: [ ovn_const.PORT_CAP_SWITCHDEV]}}} port_req = self.new_update_request( - 'ports', port_upt_data, port['id'], self.fmt) + 'ports', port_upt_data, port['id'], self.fmt, + as_admin=True) port_res = port_req.get_response(self.api) port = self.deserialize(self.fmt, port_res)['port'] @@ -948,7 +950,7 @@ class TestProvnetPorts(base.TestOVNFunctionalBase): def test_network_segments_localnet_ports(self): n1 = self._make_network( - self.fmt, 'n1', True, + self.fmt, 'n1', True, as_admin=True, arg_list=('provider:network_type', 'provider:segmentation_id', 'provider:physical_network'), |