x/group-based-policy
Code Issues Proposed changes

Correcting names when multiple endpoint pts requested

Browse Source 
Also modify name to include node_id, instance_id in endpoint info
before creating pts.

Change-Id: I25b73fb4b5c98cbb3cc710388645c3297f11b299
This commit is contained in:
Ashutosh Mishra 2016-12-19 19:23:18 +05:30
parent 8e9b1031a8
commit 67904a47ed
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gbpservice/neutron/services/servicechain/plugins/ncp/node_plumbers/traffic_stitching_plumber.py
View File

@ -90,7 +90,11 @@ class TrafficStitchingPlumber(plumber_base.NodePlumberBase):
# No stitching needed, only provider side PT is created.
# overriding PT name in order to keep port security up
# for this kind of service.
info['provider'][0]['name'] = "tscp_endpoint_service_"
node = part_context.current_node
instance = part_context.instance
for provider_info in info.get('provider', []):
provider_info['name'] = ("tscp_endpoint_service_%s_%s"
% (node['id'][:5], instance['id'][:5]))
self._create_service_target(
context, part_context, info.get('provider', []),
provider, 'provider')

40
gbpservice/neutron/tests/unit/services/servicechain/ncp/test_traffic_stitching_plumber.py
View File

@ -88,6 +88,46 @@ class TrafficStitchingPlumberTestCase(base.NodeCompositionPluginTestCase):
provider['id'])['policy_target_group']
self.assertIsNone(provider['proxy_group_id'])
def test_multiple_endpoint_pt_provider(self):
context = n_context.get_admin_context()
self.driver.get_plumbing_info.return_value = {
'provider': [{}, {}], 'consumer': [], 'plumbing_type': 'endpoint'}
provider, consumer, node = self._create_simple_chain()
provider = self.show_policy_target_group(
provider['id'])['policy_target_group']
# Verify Service PT created and contains proper name, description
targets = model.get_service_targets(context.session)
self.assertEqual(2, len(targets))
for target in targets:
pt = self.show_policy_target(
target.policy_target_id)['policy_target']
self.assertEqual(provider['id'],
pt['policy_target_group_id'])
self.assertTrue(pt['name'].startswith('tscp_endpoint_service'),
"Policy Target name doesn't start with "
"'tscp_endpoint_service'.\npt:\n%s\n" % pt)
self.assertTrue(node['id'] in pt['description'],
"Policy Target description doesn't contains "
" node id.\nnode:\n%s\n" % node)
port = self._get_object('ports', pt['port_id'], self.api)['port']
self.assertTrue(port['name'].startswith(
'pt_tscp_endpoint_service'),
"Port name doesn't start with "
"'pt_tscp_endpoint_service'.\nport:\n%s\n" % port)
self.update_policy_target_group(
provider['id'], provided_policy_rule_sets={})
# With chain deletion, also the Service PTs are deleted
new_targets = model.get_service_targets(context.session)
self.assertEqual(0, len(new_targets))
for target in targets:
self.show_policy_target(
target.policy_target_id, expected_res_status=404)
provider = self.show_policy_target_group(
provider['id'])['policy_target_group']
self.assertIsNone(provider['proxy_group_id'])
def get_plumbing_info_base(self, context):
service_type = context.current_profile['service_type']
plumbing_request = {'management': [], 'provider': [{}],