diff --git a/neutron/tests/unit/conf/policies/test_address_group.py b/neutron/tests/unit/conf/policies/test_address_group.py index b431db4f43b..7cf232ba840 100644 --- a/neutron/tests/unit/conf/policies/test_address_group.py +++ b/neutron/tests/unit/conf/policies/test_address_group.py @@ -58,10 +58,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(AddressGroupAPITestCase): +class AdminTests(AddressGroupAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_address_group(self): @@ -73,7 +73,7 @@ class ProjectAdminTests(AddressGroupAPITestCase): self.context, "get_address_group", self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_address_scope.py b/neutron/tests/unit/conf/policies/test_address_scope.py index f4ee631c6fd..627a450b415 100644 --- a/neutron/tests/unit/conf/policies/test_address_scope.py +++ b/neutron/tests/unit/conf/policies/test_address_scope.py @@ -108,10 +108,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(AddressScopeAPITestCase): +class AdminTests(AddressScopeAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_address_scope(self): @@ -158,7 +158,7 @@ class ProjectAdminTests(AddressScopeAPITestCase): self.context, 'delete_address_scope', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_agent.py b/neutron/tests/unit/conf/policies/test_agent.py index 485376d10d2..e7ea3c22141 100644 --- a/neutron/tests/unit/conf/policies/test_agent.py +++ b/neutron/tests/unit/conf/policies/test_agent.py @@ -113,10 +113,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(AgentAPITestCase): +class AdminTests(AgentAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_agent(self): @@ -176,7 +176,7 @@ class ProjectAdminTests(AgentAPITestCase): "get_l3-agents", self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_auto_allocated_topology.py b/neutron/tests/unit/conf/policies/test_auto_allocated_topology.py index 36dc3a4e441..0ac32b4fb9e 100644 --- a/neutron/tests/unit/conf/policies/test_auto_allocated_topology.py +++ b/neutron/tests/unit/conf/policies/test_auto_allocated_topology.py @@ -88,10 +88,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(AutoAllocatedTopologyAPITestCase): +class AdminTests(AutoAllocatedTopologyAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_topology(self): @@ -115,7 +115,7 @@ class ProjectAdminTests(AutoAllocatedTopologyAPITestCase): ) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_availability_zone.py b/neutron/tests/unit/conf/policies/test_availability_zone.py index 88182e5debd..ad797da9b43 100644 --- a/neutron/tests/unit/conf/policies/test_availability_zone.py +++ b/neutron/tests/unit/conf/policies/test_availability_zone.py @@ -53,10 +53,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(AvailabilityZoneAPITestCase): +class AdminTests(AvailabilityZoneAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_availability_zone(self): @@ -64,7 +64,7 @@ class ProjectAdminTests(AvailabilityZoneAPITestCase): policy.enforce(self.context, "get_availability_zone", self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_flavor.py b/neutron/tests/unit/conf/policies/test_flavor.py index 8be5b57d717..db043b5fc8f 100644 --- a/neutron/tests/unit/conf/policies/test_flavor.py +++ b/neutron/tests/unit/conf/policies/test_flavor.py @@ -97,10 +97,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(FlavorAPITestCase): +class AdminTests(FlavorAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_flavor(self): @@ -152,7 +152,7 @@ class ProjectAdminTests(FlavorAPITestCase): 'delete_flavor_service_profile', self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_floatingip.py b/neutron/tests/unit/conf/policies/test_floatingip.py index fb8d5de248f..0adfc01f2d8 100644 --- a/neutron/tests/unit/conf/policies/test_floatingip.py +++ b/neutron/tests/unit/conf/policies/test_floatingip.py @@ -104,10 +104,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(FloatingIPAPITestCase): +class AdminTests(FloatingIPAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_floatingip(self): @@ -145,7 +145,7 @@ class ProjectAdminTests(FloatingIPAPITestCase): policy.enforce(self.context, "delete_floatingip", self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_floatingip_pools.py b/neutron/tests/unit/conf/policies/test_floatingip_pools.py index 0c35aeec6e1..6895996c3bf 100644 --- a/neutron/tests/unit/conf/policies/test_floatingip_pools.py +++ b/neutron/tests/unit/conf/policies/test_floatingip_pools.py @@ -53,10 +53,10 @@ class SystemReaderTests(SystemAdminTests): self.context = self.system_reader_ctx -class ProjectAdminTests(FloatingipPoolsAPITestCase): +class AdminTests(FloatingipPoolsAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.alt_target = {'project_id': self.alt_project_id} self.context = self.project_admin_ctx @@ -72,14 +72,14 @@ class ProjectAdminTests(FloatingipPoolsAPITestCase): self.context, 'get_floatingip_pool', self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() self.context = self.project_member_ctx -class ProjectReaderTests(ProjectAdminTests): +class ProjectReaderTests(AdminTests): def setUp(self): super(ProjectReaderTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_floatingip_port_forwarding.py b/neutron/tests/unit/conf/policies/test_floatingip_port_forwarding.py index 56193e70e52..913610a9f38 100644 --- a/neutron/tests/unit/conf/policies/test_floatingip_port_forwarding.py +++ b/neutron/tests/unit/conf/policies/test_floatingip_port_forwarding.py @@ -115,10 +115,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(FloatingipPortForwardingAPITestCase): +class AdminTests(FloatingipPortForwardingAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_fip_pf(self): @@ -166,7 +166,7 @@ class ProjectAdminTests(FloatingipPortForwardingAPITestCase): self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_l3_conntrack_helper.py b/neutron/tests/unit/conf/policies/test_l3_conntrack_helper.py index 77f84d79e7d..f42224697f9 100644 --- a/neutron/tests/unit/conf/policies/test_l3_conntrack_helper.py +++ b/neutron/tests/unit/conf/policies/test_l3_conntrack_helper.py @@ -107,10 +107,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(L3ConntrackHelperAPITestCase): +class AdminTests(L3ConntrackHelperAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_router_conntrack_helper(self): @@ -150,7 +150,7 @@ class ProjectAdminTests(L3ConntrackHelperAPITestCase): self.context, 'delete_router_conntrack_helper', self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_local_ip.py b/neutron/tests/unit/conf/policies/test_local_ip.py index d9968297921..36cf733ee99 100644 --- a/neutron/tests/unit/conf/policies/test_local_ip.py +++ b/neutron/tests/unit/conf/policies/test_local_ip.py @@ -72,10 +72,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(LocalIPAPITestCase): +class AdminTests(LocalIPAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_local_ip(self): @@ -115,7 +115,7 @@ class ProjectAdminTests(LocalIPAPITestCase): policy.enforce, self.context, "delete_local_ip", self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_local_ip_association.py b/neutron/tests/unit/conf/policies/test_local_ip_association.py index e3fd50c1abf..7301f535028 100644 --- a/neutron/tests/unit/conf/policies/test_local_ip_association.py +++ b/neutron/tests/unit/conf/policies/test_local_ip_association.py @@ -103,10 +103,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(LocalIPAssociationAPITestCase): +class AdminTests(LocalIPAssociationAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_local_ip_port_association(self): @@ -143,7 +143,7 @@ class ProjectAdminTests(LocalIPAssociationAPITestCase): self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_logging.py b/neutron/tests/unit/conf/policies/test_logging.py index 81f62b6b28b..5760a0c293e 100644 --- a/neutron/tests/unit/conf/policies/test_logging.py +++ b/neutron/tests/unit/conf/policies/test_logging.py @@ -72,10 +72,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(LoggingAPITestCase): +class AdminTests(LoggingAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_loggable_resource(self): @@ -99,7 +99,7 @@ class ProjectAdminTests(LoggingAPITestCase): policy.enforce(self.context, 'delete_log', self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_metering.py b/neutron/tests/unit/conf/policies/test_metering.py index 9dff9fb0beb..c7853aad13a 100644 --- a/neutron/tests/unit/conf/policies/test_metering.py +++ b/neutron/tests/unit/conf/policies/test_metering.py @@ -108,10 +108,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(MeteringAPITestCase): +class AdminTests(MeteringAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_metering_label(self): @@ -160,7 +160,7 @@ class ProjectAdminTests(MeteringAPITestCase): self.context, 'delete_metering_label_rule', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_ndp_proxy.py b/neutron/tests/unit/conf/policies/test_ndp_proxy.py index 63f51fab27f..3c3f7d3e7a1 100644 --- a/neutron/tests/unit/conf/policies/test_ndp_proxy.py +++ b/neutron/tests/unit/conf/policies/test_ndp_proxy.py @@ -88,10 +88,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(NDPProxyAPITestCase): +class AdminTests(NDPProxyAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_ndp_proxy(self): @@ -124,7 +124,7 @@ class ProjectAdminTests(NDPProxyAPITestCase): policy.enforce, self.context, "delete_ndp_proxy", self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_network.py b/neutron/tests/unit/conf/policies/test_network.py index 00388dcb7ce..f95729c9579 100644 --- a/neutron/tests/unit/conf/policies/test_network.py +++ b/neutron/tests/unit/conf/policies/test_network.py @@ -314,10 +314,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(NetworkAPITestCase): +class AdminTests(NetworkAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_network(self): @@ -533,7 +533,7 @@ class ProjectAdminTests(NetworkAPITestCase): policy.enforce(self.context, 'delete_network', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_network_ip_availability.py b/neutron/tests/unit/conf/policies/test_network_ip_availability.py index af833ea1c7c..7887050a98d 100644 --- a/neutron/tests/unit/conf/policies/test_network_ip_availability.py +++ b/neutron/tests/unit/conf/policies/test_network_ip_availability.py @@ -53,10 +53,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_member_ctx -class ProjectAdminTests(NetworkIPAvailabilityAPITestCase): +class AdminTests(NetworkIPAvailabilityAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_network_ip_availability(self): @@ -65,7 +65,7 @@ class ProjectAdminTests(NetworkIPAvailabilityAPITestCase): self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_network_segment_range.py b/neutron/tests/unit/conf/policies/test_network_segment_range.py index 5c8e49ce385..3fcc8016686 100644 --- a/neutron/tests/unit/conf/policies/test_network_segment_range.py +++ b/neutron/tests/unit/conf/policies/test_network_segment_range.py @@ -71,10 +71,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(NetworkSegmentRangeAPITestCase): +class AdminTests(NetworkSegmentRangeAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_network_segment_range(self): @@ -98,7 +98,7 @@ class ProjectAdminTests(NetworkSegmentRangeAPITestCase): 'delete_network_segment_range', self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_port.py b/neutron/tests/unit/conf/policies/test_port.py index 5bc3d6dd8f7..a917b931f58 100644 --- a/neutron/tests/unit/conf/policies/test_port.py +++ b/neutron/tests/unit/conf/policies/test_port.py @@ -413,10 +413,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(PortAPITestCase): +class AdminTests(PortAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_port(self): @@ -708,7 +708,7 @@ class ProjectAdminTests(PortAPITestCase): policy.enforce(self.context, 'delete_port', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_qos.py b/neutron/tests/unit/conf/policies/test_qos.py index fa75158a019..8b468484da7 100644 --- a/neutron/tests/unit/conf/policies/test_qos.py +++ b/neutron/tests/unit/conf/policies/test_qos.py @@ -83,10 +83,10 @@ class SystemReaderQosPolicyTests(SystemMemberQosPolicyTests): self.context = self.system_reader_ctx -class ProjectAdminQosPolicyTests(QosPolicyAPITestCase): +class AdminQosPolicyTests(QosPolicyAPITestCase): def setUp(self): - super(ProjectAdminQosPolicyTests, self).setUp() + super(AdminQosPolicyTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy(self): @@ -114,7 +114,7 @@ class ProjectAdminQosPolicyTests(QosPolicyAPITestCase): policy.enforce(self.context, 'delete_policy', self.alt_target)) -class ProjectMemberQosPolicyTests(ProjectAdminQosPolicyTests): +class ProjectMemberQosPolicyTests(AdminQosPolicyTests): def setUp(self): super(ProjectMemberQosPolicyTests, self).setUp() @@ -193,10 +193,10 @@ class SystemReaderQosRuleTypeTests(SystemMemberQosRuleTypeTests): self.context = self.system_reader_ctx -class ProjectAdminQosRuleTypeTests(QosRuleTypeAPITestCase): +class AdminQosRuleTypeTests(QosRuleTypeAPITestCase): def setUp(self): - super(ProjectAdminQosRuleTypeTests, self).setUp() + super(AdminQosRuleTypeTests, self).setUp() self.context = self.project_admin_ctx def test_get_rule_type(self): @@ -204,7 +204,7 @@ class ProjectAdminQosRuleTypeTests(QosRuleTypeAPITestCase): policy.enforce(self.context, 'get_rule_type', self.target)) -class ProjectMemberQosRuleTypeTests(ProjectAdminQosRuleTypeTests): +class ProjectMemberQosRuleTypeTests(AdminQosRuleTypeTests): def setUp(self): super(ProjectMemberQosRuleTypeTests, self).setUp() @@ -354,10 +354,10 @@ class SystemReaderQosBandwidthLimitRuleTests( self.context = self.system_reader_ctx -class ProjectAdminQosBandwidthLimitRuleTests(QosRulesAPITestCase): +class AdminQosBandwidthLimitRuleTests(QosRulesAPITestCase): def setUp(self): - super(ProjectAdminQosBandwidthLimitRuleTests, self).setUp() + super(AdminQosBandwidthLimitRuleTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy_bandwidth_limit_rule(self): @@ -432,7 +432,7 @@ class ProjectAdminQosBandwidthLimitRuleTests(QosRulesAPITestCase): class ProjectMemberQosBandwidthLimitRuleTests( - ProjectAdminQosBandwidthLimitRuleTests): + AdminQosBandwidthLimitRuleTests): def setUp(self): super(ProjectMemberQosBandwidthLimitRuleTests, self).setUp() @@ -584,10 +584,10 @@ class SystemAdminQosPacketRateLimitRuleTests(QosRulesAPITestCase): self.alt_target) -class ProjectAdminQosPacketRateLimitRuleTests(QosRulesAPITestCase): +class AdminQosPacketRateLimitRuleTests(QosRulesAPITestCase): def setUp(self): - super(ProjectAdminQosPacketRateLimitRuleTests, self).setUp() + super(AdminQosPacketRateLimitRuleTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy_packet_rate_limit_rule(self): @@ -632,7 +632,7 @@ class ProjectAdminQosPacketRateLimitRuleTests(QosRulesAPITestCase): class ProjectMemberQosPacketRateLimitRuleTests( - ProjectAdminQosPacketRateLimitRuleTests): + AdminQosPacketRateLimitRuleTests): def setUp(self): super(ProjectMemberQosPacketRateLimitRuleTests, self).setUp() @@ -799,10 +799,10 @@ class SystemReaderQosDSCPMarkingRuleTests(SystemMemberQosDSCPMarkingRuleTests): self.context = self.system_reader_ctx -class ProjectAdminQosDSCPMarkingRuleTests(QosRulesAPITestCase): +class AdminQosDSCPMarkingRuleTests(QosRulesAPITestCase): def setUp(self): - super(ProjectAdminQosDSCPMarkingRuleTests, self).setUp() + super(AdminQosDSCPMarkingRuleTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy_dscp_marking_rule(self): @@ -877,7 +877,7 @@ class ProjectAdminQosDSCPMarkingRuleTests(QosRulesAPITestCase): class ProjectMemberQosDSCPMarkingRuleTests( - ProjectAdminQosDSCPMarkingRuleTests): + AdminQosDSCPMarkingRuleTests): def setUp(self): super(ProjectMemberQosDSCPMarkingRuleTests, self).setUp() @@ -1081,10 +1081,10 @@ class SystemReaderQosMinimumBandwidthRuleTests( self.context = self.system_reader_ctx -class ProjectAdminQosMinimumBandwidthRuleTests(QosRulesAPITestCase): +class AdminQosMinimumBandwidthRuleTests(QosRulesAPITestCase): def setUp(self): - super(ProjectAdminQosMinimumBandwidthRuleTests, self).setUp() + super(AdminQosMinimumBandwidthRuleTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy_minimum_bandwidth_rule(self): @@ -1159,7 +1159,7 @@ class ProjectAdminQosMinimumBandwidthRuleTests(QosRulesAPITestCase): class ProjectMemberQosMinimumBandwidthRuleTests( - ProjectAdminQosMinimumBandwidthRuleTests): + AdminQosMinimumBandwidthRuleTests): def setUp(self): super(ProjectMemberQosMinimumBandwidthRuleTests, self).setUp() @@ -1363,10 +1363,10 @@ class SystemReaderQosMinimumPacketRateRuleTests( self.context = self.system_reader_ctx -class ProjectAdminQosMinimumPacketRateRuleTests(QosRulesAPITestCase): +class AdminQosMinimumPacketRateRuleTests(QosRulesAPITestCase): def setUp(self): - super(ProjectAdminQosMinimumPacketRateRuleTests, self).setUp() + super(AdminQosMinimumPacketRateRuleTests, self).setUp() self.context = self.project_admin_ctx def test_get_policy_minimum_packet_rate_rule(self): @@ -1431,7 +1431,7 @@ class ProjectAdminQosMinimumPacketRateRuleTests(QosRulesAPITestCase): class ProjectMemberQosMinimumPacketRateRuleTests( - ProjectAdminQosMinimumPacketRateRuleTests): + AdminQosMinimumPacketRateRuleTests): def setUp(self): super(ProjectMemberQosMinimumPacketRateRuleTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_quotas.py b/neutron/tests/unit/conf/policies/test_quotas.py index 5c0fe7f398c..ff34c303b80 100644 --- a/neutron/tests/unit/conf/policies/test_quotas.py +++ b/neutron/tests/unit/conf/policies/test_quotas.py @@ -78,10 +78,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(QuoatsAPITestCase): +class AdminTests(QuoatsAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_quota(self): @@ -103,7 +103,7 @@ class ProjectAdminTests(QuoatsAPITestCase): policy.enforce(self.context, 'delete_quota', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_rbac.py b/neutron/tests/unit/conf/policies/test_rbac.py index f37eb5b6bb5..2b32dfebc15 100644 --- a/neutron/tests/unit/conf/policies/test_rbac.py +++ b/neutron/tests/unit/conf/policies/test_rbac.py @@ -118,10 +118,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(RbacAPITestCase): +class AdminTests(RbacAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_rbac_policy(self): @@ -170,7 +170,7 @@ class ProjectAdminTests(RbacAPITestCase): self.context, 'delete_rbac_policy', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_router.py b/neutron/tests/unit/conf/policies/test_router.py index 345f234cd37..38bd3834bcc 100644 --- a/neutron/tests/unit/conf/policies/test_router.py +++ b/neutron/tests/unit/conf/policies/test_router.py @@ -269,10 +269,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(RouterAPITestCase): +class AdminTests(RouterAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_router(self): @@ -442,7 +442,7 @@ class ProjectAdminTests(RouterAPITestCase): 'remove_router_interface', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() @@ -819,10 +819,10 @@ class SystemReaderExtrarouteTests(SystemMemberExtrarouteTests): self.context = self.system_reader_ctx -class ProjectAdminExtrarouteTests(ExtrarouteAPITestCase): +class AdminExtrarouteTests(ExtrarouteAPITestCase): def setUp(self): - super(ProjectAdminExtrarouteTests, self).setUp() + super(AdminExtrarouteTests, self).setUp() self.context = self.project_admin_ctx def test_add_extraroute(self): @@ -839,7 +839,7 @@ class ProjectAdminExtrarouteTests(ExtrarouteAPITestCase): self.context, 'remove_extraroutes', self.alt_target)) -class ProjectMemberExtrarouteTests(ProjectAdminExtrarouteTests): +class ProjectMemberExtrarouteTests(AdminExtrarouteTests): def setUp(self): super(ProjectMemberExtrarouteTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_security_group.py b/neutron/tests/unit/conf/policies/test_security_group.py index 530a02670d4..cdb11c65301 100644 --- a/neutron/tests/unit/conf/policies/test_security_group.py +++ b/neutron/tests/unit/conf/policies/test_security_group.py @@ -91,10 +91,10 @@ class SystemReaderSecurityGroupTests(SystemMemberSecurityGroupTests): self.context = self.system_reader_ctx -class ProjectAdminSecurityGroupTests(SecurityGroupAPITestCase): +class AdminSecurityGroupTests(SecurityGroupAPITestCase): def setUp(self): - super(ProjectAdminSecurityGroupTests, self).setUp() + super(AdminSecurityGroupTests, self).setUp() self.context = self.project_admin_ctx def test_create_security_group(self): @@ -130,7 +130,7 @@ class ProjectAdminSecurityGroupTests(SecurityGroupAPITestCase): self.context, 'delete_security_group', self.alt_target) -class ProjectMemberSecurityGroupTests(ProjectAdminSecurityGroupTests): +class ProjectMemberSecurityGroupTests(AdminSecurityGroupTests): def setUp(self): super(ProjectMemberSecurityGroupTests, self).setUp() @@ -249,10 +249,10 @@ class SystemReaderSecurityGroupRuleTests(SystemMemberSecurityGroupRuleTests): self.context = self.system_reader_ctx -class ProjectAdminSecurityGroupRuleTests(SecurityGroupRuleAPITestCase): +class AdminSecurityGroupRuleTests(SecurityGroupRuleAPITestCase): def setUp(self): - super(ProjectAdminSecurityGroupRuleTests, self).setUp() + super(AdminSecurityGroupRuleTests, self).setUp() self.context = self.project_admin_ctx def test_create_security_group_rule(self): @@ -294,7 +294,7 @@ class ProjectAdminSecurityGroupRuleTests(SecurityGroupRuleAPITestCase): self.context, 'delete_security_group_rule', self.alt_target) -class ProjectMemberSecurityGroupRuleTests(ProjectAdminSecurityGroupRuleTests): +class ProjectMemberSecurityGroupRuleTests(AdminSecurityGroupRuleTests): def setUp(self): super(ProjectMemberSecurityGroupRuleTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_segment.py b/neutron/tests/unit/conf/policies/test_segment.py index 96bbaf00279..010ca447807 100644 --- a/neutron/tests/unit/conf/policies/test_segment.py +++ b/neutron/tests/unit/conf/policies/test_segment.py @@ -71,10 +71,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(SegmentAPITestCase): +class AdminTests(SegmentAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_segment(self): @@ -94,7 +94,7 @@ class ProjectAdminTests(SegmentAPITestCase): policy.enforce(self.context, 'delete_segment', self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_service_type.py b/neutron/tests/unit/conf/policies/test_service_type.py index 19cb12cacfa..98e33b39e5a 100644 --- a/neutron/tests/unit/conf/policies/test_service_type.py +++ b/neutron/tests/unit/conf/policies/test_service_type.py @@ -53,10 +53,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(ServiceTypeAPITestCase): +class AdminTests(ServiceTypeAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_get_service_provider(self): @@ -64,7 +64,7 @@ class ProjectAdminTests(ServiceTypeAPITestCase): policy.enforce(self.context, 'get_service_provider', self.target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_subnet.py b/neutron/tests/unit/conf/policies/test_subnet.py index adae4280c33..cee00fc70d7 100644 --- a/neutron/tests/unit/conf/policies/test_subnet.py +++ b/neutron/tests/unit/conf/policies/test_subnet.py @@ -158,10 +158,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(SubnetAPITestCase): +class AdminTests(SubnetAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_subnet(self): @@ -228,7 +228,7 @@ class ProjectAdminTests(SubnetAPITestCase): policy.enforce(self.context, 'delete_subnet', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_subnetpool.py b/neutron/tests/unit/conf/policies/test_subnetpool.py index ecf3e28327e..0abc4fb8aff 100644 --- a/neutron/tests/unit/conf/policies/test_subnetpool.py +++ b/neutron/tests/unit/conf/policies/test_subnetpool.py @@ -148,10 +148,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(SubnetpoolAPITestCase): +class AdminTests(SubnetpoolAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_subnetpool(self): @@ -223,7 +223,7 @@ class ProjectAdminTests(SubnetpoolAPITestCase): policy.enforce(self.context, 'remove_prefixes', self.alt_target)) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp() diff --git a/neutron/tests/unit/conf/policies/test_trunk.py b/neutron/tests/unit/conf/policies/test_trunk.py index 5f3e72d6ea0..3f91f8be733 100644 --- a/neutron/tests/unit/conf/policies/test_trunk.py +++ b/neutron/tests/unit/conf/policies/test_trunk.py @@ -118,10 +118,10 @@ class SystemReaderTests(SystemMemberTests): self.context = self.system_reader_ctx -class ProjectAdminTests(TrunkAPITestCase): +class AdminTests(TrunkAPITestCase): def setUp(self): - super(ProjectAdminTests, self).setUp() + super(AdminTests, self).setUp() self.context = self.project_admin_ctx def test_create_trunk(self): @@ -181,7 +181,7 @@ class ProjectAdminTests(TrunkAPITestCase): self.context, 'remove_subports', self.alt_target) -class ProjectMemberTests(ProjectAdminTests): +class ProjectMemberTests(AdminTests): def setUp(self): super(ProjectMemberTests, self).setUp()