openstack/heat
Code Issues Proposed changes

Rename the client routines for sfc to more generic name

Browse Source 
Rename the client routines used for SFC resources to a generic
name so that other plugins/extensions can reusee those routines

Change-Id: Iaddec21014ff8c70fa11f17d52f53e5d7d4e3578
This commit is contained in:
Deepak Tiwari 2018-12-14 04:51:37 -06:00 committed by Zane Bitter
parent 7cdadf1155
commit 262c432e96
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
heat/engine/clients/os/neutron/__init__.py
View File

@ -189,7 +189,7 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
return seclist
def _resolve_resource_path(self, resource):
"""Returns sfc resource path."""
"""Returns ext resource path."""
if resource == 'port_pair':
path = "/sfc/port_pairs"
@ -201,29 +201,29 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
path = "/sfc/port_chains"
return path
def create_sfc_resource(self, resource, props):
"""Returns created sfc resource record."""
def create_ext_resource(self, resource, props):
"""Returns created ext resource record."""
path = self._resolve_resource_path(resource)
record = self.client().create_ext(path, {resource: props}
).get(resource)
return record
def update_sfc_resource(self, resource, prop_diff, resource_id):
"""Returns updated sfc resource record."""
def update_ext_resource(self, resource, prop_diff, resource_id):
"""Returns updated ext resource record."""
path = self._resolve_resource_path(resource)
return self.client().update_ext(path + '/%s', resource_id,
{resource: prop_diff})
def delete_sfc_resource(self, resource, resource_id):
"""Deletes sfc resource record and returns status."""
def delete_ext_resource(self, resource, resource_id):
"""Deletes ext resource record and returns status."""
path = self._resolve_resource_path(resource)
return self.client().delete_ext(path + '/%s', resource_id)
def show_sfc_resource(self, resource, resource_id):
"""Returns specific sfc resource record."""
def show_ext_resource(self, resource, resource_id):
"""Returns specific ext resource record."""
path = self._resolve_resource_path(resource)
return self.client().show_ext(path + '/%s', resource_id

8
heat/engine/resources/openstack/neutron/sfc/flow_classifier.py
View File

@ -159,21 +159,21 @@ class FlowClassifier(neutron.NeutronResource):
]
def _show_resource(self):
return self.client_plugin().show_sfc_resource('flow_classifier',
return self.client_plugin().show_ext_resource('flow_classifier',
self.resource_id)
def handle_create(self):
props = self.prepare_properties(
self.properties,
self.physical_resource_name())
flow_classifier = self.client_plugin().create_sfc_resource(
flow_classifier = self.client_plugin().create_ext_resource(
'flow_classifier', props)
self.resource_id_set(flow_classifier['id'])
def handle_update(self, json_snippet, tmpl_diff, prop_diff):
if prop_diff:
self.prepare_update_properties(prop_diff)
self.client_plugin().update_sfc_resource('flow_classifier',
self.client_plugin().update_ext_resource('flow_classifier',
prop_diff,
self.resource_id)
@ -181,7 +181,7 @@ class FlowClassifier(neutron.NeutronResource):
if self.resource_id is None:
return
with self.client_plugin().ignore_not_found:
self.client_plugin().delete_sfc_resource('flow_classifier',
self.client_plugin().delete_ext_resource('flow_classifier',
self.resource_id)

8
heat/engine/resources/openstack/neutron/sfc/port_chain.py
View File

@ -109,20 +109,20 @@ class PortChain(neutron.NeutronResource):
]
def _show_resource(self):
return self.client_plugin().show_sfc_resource('port_chain',
return self.client_plugin().show_ext_resource('port_chain',
self.resource_id)
def handle_create(self):
props = self.prepare_properties(self.properties,
self.physical_resource_name())
port_chain = self.client_plugin().create_sfc_resource(
port_chain = self.client_plugin().create_ext_resource(
'port_chain', props)
self.resource_id_set(port_chain['id'])
def handle_update(self, json_snippet, tmpl_diff, prop_diff):
if prop_diff:
self.prepare_update_properties(prop_diff)
self.client_plugin().update_sfc_resource('port_chain',
self.client_plugin().update_ext_resource('port_chain',
prop_diff,
self.resource_id)
@ -130,7 +130,7 @@ class PortChain(neutron.NeutronResource):
if self.resource_id is None:
return
with self.client_plugin().ignore_not_found:
self.client_plugin().delete_sfc_resource('port_chain',
self.client_plugin().delete_ext_resource('port_chain',
self.resource_id)

8
heat/engine/resources/openstack/neutron/sfc/port_pair.py
View File

@ -96,7 +96,7 @@ class PortPair(neutron.NeutronResource):
]
def _show_resource(self):
return self.client_plugin().show_sfc_resource('port_pair',
return self.client_plugin().show_ext_resource('port_pair',
self.resource_id)
def handle_create(self):
@ -104,21 +104,21 @@ class PortPair(neutron.NeutronResource):
self.physical_resource_name())
props['ingress'] = props.get(self.INGRESS)
props['egress'] = props.get(self.EGRESS)
port_pair = self.client_plugin().create_sfc_resource('port_pair',
port_pair = self.client_plugin().create_ext_resource('port_pair',
props)
self.resource_id_set(port_pair['id'])
def handle_update(self, json_snippet, tmpl_diff, prop_diff):
if prop_diff:
self.prepare_update_properties(prop_diff)
self.client_plugin().update_sfc_resource('port_pair', prop_diff,
self.client_plugin().update_ext_resource('port_pair', prop_diff,
self.resource_id)
def handle_delete(self):
if self.resource_id is None:
return
with self.client_plugin().ignore_not_found:
self.client_plugin().delete_sfc_resource('port_pair',
self.client_plugin().delete_ext_resource('port_pair',
self.resource_id)

8
heat/engine/resources/openstack/neutron/sfc/port_pair_group.py
View File

@ -78,7 +78,7 @@ class PortPairGroup(neutron.NeutronResource):
]
def _show_resource(self):
return self.client_plugin().show_sfc_resource('port_pair_group',
return self.client_plugin().show_ext_resource('port_pair_group',
self.resource_id)
def handle_create(self):
@ -86,14 +86,14 @@ class PortPairGroup(neutron.NeutronResource):
self.properties,
self.physical_resource_name())
port_pair_group = self.client_plugin().create_sfc_resource(
port_pair_group = self.client_plugin().create_ext_resource(
'port_pair_group', props)
self.resource_id_set(port_pair_group['id'])
def handle_update(self, json_snippet, tmpl_diff, prop_diff):
if prop_diff:
self.prepare_update_properties(prop_diff)
self.client_plugin().update_sfc_resource(
self.client_plugin().update_ext_resource(
'port_pair_group',
prop_diff,
self.resource_id)
@ -102,7 +102,7 @@ class PortPairGroup(neutron.NeutronResource):
if self.resource_id is None:
return
with self.client_plugin().ignore_not_found:
self.client_plugin().delete_sfc_resource('port_pair_group',
self.client_plugin().delete_ext_resource('port_pair_group',
self.resource_id)

12
heat/tests/openstack/neutron/test_sfc/test_flow_classifier.py
View File

@ -77,7 +77,7 @@ class FlowClassifierTest(common.HeatTestCase):
return value
def test_resource_handle_create(self):
mock_fc_create = self.test_client_plugin.create_sfc_resource
mock_fc_create = self.test_client_plugin.create_ext_resource
mock_resource = self._get_mock_resource()
mock_fc_create.return_value = mock_resource
# validate the properties
@ -157,7 +157,7 @@ class FlowClassifierTest(common.HeatTestCase):
)
def test_resource_handle_delete(self):
mock_fc_delete = self.test_client_plugin.delete_sfc_resource
mock_fc_delete = self.test_client_plugin.delete_ext_resource
self.test_resource.resource_id = '2a046ff4-cd7b-4500-b8f0-b60d96ce3e0c'
mock_fc_delete.return_value = None
self.assertIsNone(self.test_resource.handle_delete())
@ -168,23 +168,23 @@ class FlowClassifierTest(common.HeatTestCase):
self.test_resource.resource_id = None
self.assertIsNone(self.test_resource.handle_delete())
self.assertEqual(0, self.test_client_plugin.
delete_sfc_resource.call_count)
delete_ext_resource.call_count)
def test_resource_handle_delete_not_found(self):
self.test_resource.resource_id = '2a046ff4-cd7b-4500-b8f0-b60d96ce3e0c'
mock_fc_delete = self.test_client_plugin.delete_sfc_resource
mock_fc_delete = self.test_client_plugin.delete_ext_resource
mock_fc_delete.side_effect = self.test_client_plugin.NotFound
self.assertIsNone(self.test_resource.handle_delete())
def test_resource_show_resource(self):
mock_fc_get = self.test_client_plugin.show_sfc_resource
mock_fc_get = self.test_client_plugin.show_ext_resource
mock_fc_get.return_value = {}
self.assertEqual({},
self.test_resource._show_resource(),
'Failed to show resource')
def test_resource_handle_update(self):
mock_fc_patch = self.test_client_plugin.update_sfc_resource
mock_fc_patch = self.test_client_plugin.update_ext_resource
self.test_resource.resource_id = '2a046ff4-cd7b-4500-b8f0-b60d96ce3e0c'
prop_diff = {

12
heat/tests/openstack/neutron/test_sfc/test_port_chain.py
View File

@ -83,7 +83,7 @@ class PortChainTest(common.HeatTestCase):
return value
def test_resource_handle_create(self):
mock_pc_create = self.test_client_plugin.create_sfc_resource
mock_pc_create = self.test_client_plugin.create_ext_resource
mock_resource = self._get_mock_resource()
mock_pc_create.return_value = mock_resource
@ -123,7 +123,7 @@ class PortChainTest(common.HeatTestCase):
)
def delete_portchain(self):
mock_pc_delete = self.test_client_plugin.delete_sfc_resource
mock_pc_delete = self.test_client_plugin.delete_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_pc_delete.return_value = None
self.assertIsNone(self.test_resource.handle_delete())
@ -134,22 +134,22 @@ class PortChainTest(common.HeatTestCase):
self.test_resource.resource_id = None
self.assertIsNone(self.test_resource.handle_delete())
self.assertEqual(0, self.test_client_plugin.
delete_sfc_resource.call_count)
delete_ext_resource.call_count)
def test_resource_handle_delete_not_found(self):
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_pc_delete = self.test_client_plugin.delete_sfc_resource
mock_pc_delete = self.test_client_plugin.delete_ext_resource
mock_pc_delete.side_effect = self.test_client_plugin.NotFound
self.assertIsNone(self.test_resource.handle_delete())
def test_resource_show_resource(self):
mock_pc_get = self.test_client_plugin.show_sfc_resource
mock_pc_get = self.test_client_plugin.show_ext_resource
mock_pc_get.return_value = None
self.assertIsNone(self.test_resource._show_resource(),
'Failed to show resource')
def test_resource_handle_update(self):
mock_ppg_patch = self.test_client_plugin.update_sfc_resource
mock_ppg_patch = self.test_client_plugin.update_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
prop_diff = {
'name': 'name-updated',

12
heat/tests/openstack/neutron/test_sfc/test_port_pair.py
View File

@ -70,7 +70,7 @@ class PortPairTest(common.HeatTestCase):
return value
def test_resource_handle_create(self):
mock_port_pair_create = self.test_client_plugin.create_sfc_resource
mock_port_pair_create = self.test_client_plugin.create_ext_resource
mock_resource = self._get_mock_resource()
mock_port_pair_create.return_value = mock_resource
@ -110,7 +110,7 @@ class PortPairTest(common.HeatTestCase):
)
def test_resource_handle_delete(self):
mock_port_pair_delete = self.test_client_plugin.delete_sfc_resource
mock_port_pair_delete = self.test_client_plugin.delete_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_port_pair_delete.return_value = None
self.assertIsNone(self.test_resource.handle_delete())
@ -121,23 +121,23 @@ class PortPairTest(common.HeatTestCase):
self.test_resource.resource_id = None
self.assertIsNone(self.test_resource.handle_delete())
self.assertEqual(0, self.test_client_plugin.
delete_sfc_resource.call_count)
delete_ext_resource.call_count)
def test_resource_handle_delete_not_found(self):
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_port_pair_delete = self.test_client_plugin.delete_sfc_resource
mock_port_pair_delete = self.test_client_plugin.delete_ext_resource
mock_port_pair_delete.side_effect = self.test_client_plugin.NotFound
self.assertIsNone(self.test_resource.handle_delete())
def test_resource_show_resource(self):
mock_port_pair_get = self.test_client_plugin.show_sfc_resource
mock_port_pair_get = self.test_client_plugin.show_ext_resource
mock_port_pair_get.return_value = {}
self.assertEqual({},
self.test_resource._show_resource(),
'Failed to show resource')
def test_resource_handle_update(self):
mock_port_pair_patch = self.test_client_plugin.update_sfc_resource
mock_port_pair_patch = self.test_client_plugin.update_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
prop_diff = {

16
heat/tests/openstack/neutron/test_sfc/test_port_pair_group.py
View File

@ -76,13 +76,13 @@ class PortPairGroupTest(common.HeatTestCase):
value.id = '477e8273-60a7-4c41-b683-fdb0bc7cd152'
return value
def _resolve_sfc_resource(self):
def _resolve_ext_resource(self):
value = mock.MagicMock()
value.id = '[port1]'
return value.id
def test_resource_handle_create(self):
mock_ppg_create = self.test_client_plugin.create_sfc_resource
mock_ppg_create = self.test_client_plugin.create_ext_resource
mock_resource = self._get_mock_resource()
mock_ppg_create.return_value = mock_resource
@ -113,7 +113,7 @@ class PortPairGroupTest(common.HeatTestCase):
)
def test_resource_handle_delete(self):
mock_ppg_delete = self.test_client_plugin.delete_sfc_resource
mock_ppg_delete = self.test_client_plugin.delete_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_ppg_delete.return_value = None
self.assertIsNone(self.test_resource.handle_delete())
@ -124,23 +124,23 @@ class PortPairGroupTest(common.HeatTestCase):
self.test_resource.resource_id = None
self.assertIsNone(self.test_resource.handle_delete())
self.assertEqual(0, self.test_client_plugin.
delete_sfc_resource.call_count)
delete_ext_resource.call_count)
def test_resource_handle_delete_not_found(self):
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
mock_ppg_delete = self.test_client_plugin.delete_sfc_resource
mock_ppg_delete = self.test_client_plugin.delete_ext_resource
mock_ppg_delete.side_effect = self.test_client_plugin.NotFound
self.assertIsNone(self.test_resource.handle_delete())
def test_resource_show_resource(self):
mock_ppg_get = self.test_client_plugin.show_sfc_resource
mock_ppg_get = self.test_client_plugin.show_ext_resource
mock_ppg_get.return_value = {}
self.assertEqual({},
self.test_resource._show_resource(),
'Failed to show resource')
def test_resource_handle_update(self):
mock_ppg_patch = self.test_client_plugin.update_sfc_resource
mock_ppg_patch = self.test_client_plugin.update_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
prop_diff = {
'name': 'name-updated',
@ -160,7 +160,7 @@ class PortPairGroupTest(common.HeatTestCase):
def test_resource_handle_update_port_pairs(self):
self.patchobject(self.test_client_plugin,
'resolve_ext_resource').return_value = ('port2')
mock_ppg_patch = self.test_client_plugin.update_sfc_resource
mock_ppg_patch = self.test_client_plugin.update_ext_resource
self.test_resource.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
prop_diff = {