octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0.0rc1__py3-none-any.whl

octavia/tests/functional/api/v2/test_l7policy.py

@@ -76,7 +76,7 @@ class TestL7Policy(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -209,7 +209,7 @@ class TestL7Policy(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -523,9 +523,9 @@ class TestL7Policy(base.BaseAPITest):
         l7pos = self.get(self.L7POLICIES_PATH, params={
             'fields': ['id', 'project_id']}).json
         for l7po in l7pos['l7policies']:
-            self.assertIn(u'id', l7po)
-            self.assertIn(u'project_id', l7po)
-            self.assertNotIn(u'description', l7po)
+            self.assertIn('id', l7po)
+            self.assertIn('project_id', l7po)
+            self.assertNotIn('description', l7po)
 
     def test_get_one_fields_filter(self):
         l7p1 = self.create_l7policy(
@@ -536,9 +536,9 @@ class TestL7Policy(base.BaseAPITest):
         l7po = self.get(
             self.L7POLICY_PATH.format(l7policy_id=l7p1.get('id')),
             params={'fields': ['id', 'project_id']}).json.get(self.root_tag)
-        self.assertIn(u'id', l7po)
-        self.assertIn(u'project_id', l7po)
-        self.assertNotIn(u'description', l7po)
+        self.assertIn('id', l7po)
+        self.assertIn('project_id', l7po)
+        self.assertNotIn('description', l7po)
 
     def test_get_all_filter(self):
         policy1 = self.create_l7policy(
@@ -685,7 +685,7 @@ class TestL7Policy(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -919,7 +919,7 @@ class TestL7Policy(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -1165,7 +1165,7 @@ class TestL7Policy(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,

octavia/tests/functional/api/v2/test_l7rule.py

@@ -76,7 +76,7 @@ class TestL7Rule(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -175,7 +175,7 @@ class TestL7Rule(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -356,9 +356,9 @@ class TestL7Rule(base.BaseAPITest):
         l7rus = self.get(self.l7rules_path, params={
             'fields': ['id', 'compare_type']}).json
         for l7ru in l7rus['rules']:
-            self.assertIn(u'id', l7ru)
-            self.assertIn(u'compare_type', l7ru)
-            self.assertNotIn(u'project_id', l7ru)
+            self.assertIn('id', l7ru)
+            self.assertIn('compare_type', l7ru)
+            self.assertNotIn('project_id', l7ru)
 
     def test_get_one_fields_filter(self):
         l7r1 = self.create_l7rule(
@@ -370,9 +370,9 @@ class TestL7Rule(base.BaseAPITest):
         l7ru = self.get(
             self.l7rule_path.format(l7rule_id=l7r1.get('id')),
             params={'fields': ['id', 'compare_type']}).json.get(self.root_tag)
-        self.assertIn(u'id', l7ru)
-        self.assertIn(u'compare_type', l7ru)
-        self.assertNotIn(u'project_id', l7ru)
+        self.assertIn('id', l7ru)
+        self.assertIn('compare_type', l7ru)
+        self.assertNotIn('project_id', l7ru)
 
     def test_get_all_filter(self):
         ru1 = self.create_l7rule(
@@ -542,7 +542,7 @@ class TestL7Rule(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -599,8 +599,7 @@ class TestL7Rule(base.BaseAPITest):
             l7policy_id, constants.L7RULE_TYPE_HOST_NAME,
             constants.L7RULE_COMPARE_TYPE_EQUAL_TO,
             'www.example.com', status=409)
-        ref_msg = ('L7Policy %s is immutable and cannot be updated.' %
-                   l7policy_id)
+        ref_msg = f'L7Policy {l7policy_id} is immutable and cannot be updated.'
         self.assertEqual(ref_msg, api_l7rule.get('faultstring'))
 
     def test_create_path_rule(self):
@@ -797,7 +796,7 @@ class TestL7Rule(base.BaseAPITest):
                   'key': 'no-need-key'}
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
-        self.assertIn('L7rule type {0} does not use the "key" field.'.format(
+        self.assertIn('L7rule type {} does not use the "key" field.'.format(
             constants.L7RULE_TYPE_SSL_CONN_HAS_CERT),
             response.get('faultstring'))
 
@@ -806,7 +805,7 @@ class TestL7Rule(base.BaseAPITest):
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule value {0} is not a boolean True string.'.format(
+            'L7rule value {} is not a boolean True string.'.format(
                 l7rule['value']), response.get('faultstring'))
 
         l7rule['value'] = 'tRUe'
@@ -814,7 +813,7 @@ class TestL7Rule(base.BaseAPITest):
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule type {0} only supports the {1} compare type.'.format(
+            'L7rule type {} only supports the {} compare type.'.format(
                 constants.L7RULE_TYPE_SSL_CONN_HAS_CERT,
                 constants.L7RULE_COMPARE_TYPE_EQUAL_TO),
             response.get('faultstring'))
@@ -829,14 +828,14 @@ class TestL7Rule(base.BaseAPITest):
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule type {0} does not use the "key" field.'.format(
+            'L7rule type {} does not use the "key" field.'.format(
                 l7rule['type']), response.get('faultstring'))
 
         l7rule.pop('key')
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule type {0} needs a int value, which is >= 0'.format(
+            'L7rule type {} needs a int value, which is >= 0'.format(
                 l7rule['type']), response.get('faultstring'))
 
         l7rule['value'] = '0'
@@ -844,7 +843,7 @@ class TestL7Rule(base.BaseAPITest):
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule type {0} only supports the {1} compare type.'.format(
+            'L7rule type {} only supports the {} compare type.'.format(
                 l7rule['type'], constants.L7RULE_COMPARE_TYPE_EQUAL_TO),
             response.get('faultstring'))
 
@@ -861,7 +860,7 @@ class TestL7Rule(base.BaseAPITest):
         response = req_func(first_req_arg, self._build_body(l7rule),
                             status=400).json
         self.assertIn(
-            'L7rule type {0} needs to specify a key and a value.'.format(
+            'L7rule type {} needs to specify a key and a value.'.format(
                 l7rule['type']), response.get('faultstring'))
 
         l7rule['key'] = 'NOT_SUPPORTED_DN_FIELD'
@@ -922,7 +921,7 @@ class TestL7Rule(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -1126,7 +1125,7 @@ class TestL7Rule(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,

octavia/tests/functional/api/v2/test_listener.py

@@ -112,7 +112,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -383,9 +383,9 @@ class TestListener(base.BaseAPITest):
         lis = self.get(self.LISTENERS_PATH, params={
             'fields': ['id', 'project_id']}).json
         for li in lis['listeners']:
-            self.assertIn(u'id', li)
-            self.assertIn(u'project_id', li)
-            self.assertNotIn(u'description', li)
+            self.assertIn('id', li)
+            self.assertIn('project_id', li)
+            self.assertNotIn('description', li)
 
     def test_get_one_fields_filter(self):
         listener1 = self.create_listener(
@@ -396,9 +396,9 @@ class TestListener(base.BaseAPITest):
         li = self.get(
             self.LISTENER_PATH.format(listener_id=listener1.get('id')),
             params={'fields': ['id', 'project_id']}).json.get(self.root_tag)
-        self.assertIn(u'id', li)
-        self.assertIn(u'project_id', li)
-        self.assertNotIn(u'description', li)
+        self.assertIn('id', li)
+        self.assertIn('project_id', li)
+        self.assertNotIn('description', li)
 
     def test_get_all_filter(self):
         li1 = self.create_listener(constants.PROTOCOL_HTTP,
@@ -558,7 +558,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -699,11 +699,10 @@ class TestListener(base.BaseAPITest):
             optionals.update({field[0]: 1})
             fault = resp.get('faultstring')
             self.assertIn(
-                'Invalid input for field/attribute {0}'.format(
-                    field[0]), fault)
+                f'Invalid input for field/attribute {field[0]}', fault)
             self.assertIn(
-                'Value should be lower or equal to {0}'.format(
-                    constants.MAX_TIMEOUT), fault)
+                f'Value should be lower or equal to {constants.MAX_TIMEOUT}',
+                fault)
 
     def test_create_with_timeouts_too_low(self):
         optionals = {
@@ -717,8 +716,8 @@ class TestListener(base.BaseAPITest):
         self.assertIn(
             'Invalid input for field/attribute timeout_tcp_inspect', fault)
         self.assertIn(
-            'Value should be greater or equal to {0}'.format(
-                constants.MIN_TIMEOUT), fault)
+            f'Value should be greater or equal to {constants.MIN_TIMEOUT}',
+            fault)
 
     def test_create_udp_case(self):
         api_listener = self.create_listener(constants.PROTOCOL_UDP, 6666,
@@ -807,7 +806,7 @@ class TestListener(base.BaseAPITest):
         self.assertIn(
             'Certificate container references are not allowed on ', fault)
         self.assertIn(
-            '{} protocol listeners.'.format(constants.PROTOCOL_TCP), fault)
+            f'{constants.PROTOCOL_TCP} protocol listeners.', fault)
 
     def test_create_without_certs_if_terminated_https(self):
         optionals = {
@@ -977,7 +976,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -1276,7 +1275,7 @@ class TestListener(base.BaseAPITest):
         self._test_create_with_allowed_cidrs(allowed_cidrs, lb_id)
 
     def test_create_with_bad_allowed_cidrs(self):
-        allowed_cidrs = [u'10.0.1.0/33', u'172.16.55.1.0/25']
+        allowed_cidrs = ['10.0.1.0/33', '172.16.55.1.0/25']
         lb_listener = {
             'protocol': constants.PROTOCOL_TCP,
             'protocol_port': 80,
@@ -1715,8 +1714,7 @@ class TestListener(base.BaseAPITest):
         fault = response.get('faultstring')
         self.assertIn(
             'Certificate container references are not allowed on ', fault)
-        self.assertIn('{} protocol listeners.'.format(
-            constants.PROTOCOL_TCP), fault)
+        self.assertIn(f'{constants.PROTOCOL_TCP} protocol listeners.', fault)
 
     def test_update_with_ca_cert(self):
         self.cert_manager_mock().get_secret.return_value = (
@@ -2108,7 +2106,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -2269,7 +2267,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -2576,7 +2574,7 @@ class TestListener(base.BaseAPITest):
                                         default_tls_container_ref=cert_id,
                                         status=400)
         self.assertIn(
-            'The selected protocol is not allowed in this deployment: {0}'
+            'The selected protocol is not allowed in this deployment: {}'
             .format(constants.PROTOCOL_TERMINATED_HTTPS),
             listener.get('faultstring'))
 
@@ -2776,9 +2774,9 @@ class TestListener(base.BaseAPITest):
             lb_listener['insert_headers'] = header
             body = self._build_body(lb_listener)
             listener = self.post(self.LISTENERS_PATH, body, status=400).json
-            self.assertIn('{0} is not a valid option for {1}'.format(
+            self.assertIn('{} is not a valid option for {}'.format(
                 [name],
-                '%s protocol listener.' % constants.PROTOCOL_HTTP),
+                f'{constants.PROTOCOL_HTTP} protocol listener.'),
                 listener.get('faultstring'))
 
     @mock.patch('octavia.common.tls_utils.cert_parser.load_certificates_data')
@@ -2829,9 +2827,9 @@ class TestListener(base.BaseAPITest):
             listener_id=listener['listener'].get('id'))
         update_listener = self.put(
             listener_path, new_listener, status=400).json
-        self.assertIn('{0} is not a valid option for {1}'.format(
-            '[\'X-Bad-Header\']', 'insert_headers'),
-            update_listener.get('faultstring'))
+        self.assertIn('[\'X-Bad-Header\'] is not a valid option for '
+                      'insert_headers',
+                      update_listener.get('faultstring'))
 
         # test client certificate http headers
         header = {}
@@ -2928,7 +2926,7 @@ class TestListener(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,

octavia/tests/functional/api/v2/test_load_balancer.py

@@ -156,7 +156,7 @@ class TestLoadBalancer(base.BaseAPITest):
                         ".NoopManager.get_subnet") as mock_get_subnet:
             mock_get_subnet.side_effect = network_base.SubnetNotFound
             response = self.post(self.LBS_PATH, body, status=400)
-            err_msg = 'Subnet {} not found.'.format(subnet_id)
+            err_msg = f'Subnet {subnet_id} not found.'
             self.assertEqual(err_msg, response.json.get('faultstring'))
 
     def test_create_with_invalid_vip_network_subnet(self):
@@ -172,7 +172,7 @@ class TestLoadBalancer(base.BaseAPITest):
                         ".NoopManager.get_network") as mock_get_network:
             mock_get_network.return_value = network
             response = self.post(self.LBS_PATH, body, status=400)
-            err_msg = 'Subnet {} not found.'.format(subnet_id)
+            err_msg = f'Subnet {subnet_id} not found.'
             self.assertEqual(err_msg, response.json.get('faultstring'))
 
     def test_create_with_vip_subnet_fills_network(self):
@@ -850,7 +850,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 mock_get_subnet.return_value = subnet
                 mock_get_qos.side_effect = Exception()
                 response = self.post(self.LBS_PATH, body, status=400)
-        err_msg = "qos_policy %s not found." % qos_policy_id
+        err_msg = f"qos_policy {qos_policy_id} not found."
         self.assertEqual(err_msg, response.json.get('faultstring'))
 
     def test_create_with_long_name(self):
@@ -995,7 +995,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -1306,7 +1306,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -1414,7 +1414,7 @@ class TestLoadBalancer(base.BaseAPITest):
                                   name='lb3', project_id=project_id)
         auth_strategy = self.conf.conf.api_settings.get('auth_strategy')
         self.conf.config(group='api_settings', auth_strategy=constants.TESTING)
-        LB_PROJECT_PATH = '{}?project_id={}'.format(self.LBS_PATH, project_id)
+        LB_PROJECT_PATH = f'{self.LBS_PATH}?project_id={project_id}'
         with mock.patch.object(octavia.common.context.RequestContext,
                                'project_id',
                                self.project_id):
@@ -1567,9 +1567,9 @@ class TestLoadBalancer(base.BaseAPITest):
         lbs = self.get(self.LBS_PATH, params={
             'fields': ['id', 'project_id']}).json
         for lb in lbs['loadbalancers']:
-            self.assertIn(u'id', lb)
-            self.assertIn(u'project_id', lb)
-            self.assertNotIn(u'description', lb)
+            self.assertIn('id', lb)
+            self.assertIn('project_id', lb)
+            self.assertNotIn('description', lb)
 
     def test_get_one_fields_filter(self):
         lb1 = self.create_load_balancer(
@@ -1579,9 +1579,9 @@ class TestLoadBalancer(base.BaseAPITest):
         lb = self.get(
             self.LB_PATH.format(lb_id=lb1.get('id')),
             params={'fields': ['id', 'project_id']}).json.get(self.root_tag)
-        self.assertIn(u'id', lb)
-        self.assertIn(u'project_id', lb)
-        self.assertNotIn(u'description', lb)
+        self.assertIn('id', lb)
+        self.assertIn('project_id', lb)
+        self.assertNotIn('description', lb)
 
     def test_get_all_admin_state_up_filter(self):
         self.create_load_balancer(uuidutils.generate_uuid(),
@@ -1892,7 +1892,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -2092,7 +2092,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -2276,7 +2276,7 @@ class TestLoadBalancer(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -4008,7 +4008,7 @@ class TestLoadBalancerGraph(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,
@@ -4111,7 +4111,7 @@ class TestLoadBalancerGraph(base.BaseAPITest):
                 'is_admin_project': True,
                 'service_project_domain_id': None,
                 'service_project_id': None,
-                'roles': ['load-balancer_member'],
+                'roles': ['load-balancer_member', 'member'],
                 'user_id': None,
                 'is_admin': False,
                 'service_user_domain_id': None,