Skip to content

Commit

Permalink
Clean up code of virt_phy_sw_v2 module
Browse files Browse the repository at this point in the history
 Removes two methods not used:
 * _get_all_segmentation_ids
 * _validate_vlan_id

 About log formatting:
 * In the __init__, '\n' can be removed from this line:
     LOG.debug(_("Loaded device plugin %s\n"),

Closes-Bug: 1180783

Change-Id: Ic0aea7e8016f198e2ba245c710e12bc490720039
  • Loading branch information
sahid committed Sep 12, 2013
1 parent 116b2fa commit f342f25
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions neutron/plugins/cisco/models/virt_phy_sw_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def __init__(self):
plugin_obj = conf.CISCO_PLUGINS[key]
if plugin_obj is not None:
self._plugins[key] = importutils.import_object(plugin_obj)
LOG.debug(_("Loaded device plugin %s\n"),
LOG.debug(_("Loaded device plugin %s"),
conf.CISCO_PLUGINS[key])

if ((const.VSWITCH_PLUGIN in self._plugins) and
Expand Down Expand Up @@ -176,20 +176,6 @@ def _get_segmentation_id(self, network_id):
raise cexc.NetworkSegmentIDNotFound(net_id=network_id)
return binding_seg_id.segmentation_id

def _get_all_segmentation_ids(self):
vlan_ids = cdb.get_ovs_vlans()
vlanids = ''
for v_id in vlan_ids:
if int(v_id) > 0:
vlanids = str(v_id) + ',' + vlanids
return vlanids.strip(',')

def _validate_vlan_id(self, vlan_id):
if vlan_id and int(vlan_id) > 1:
return True
else:
return False

def _get_instance_host(self, tenant_id, instance_id):
keystone_conf = cfg.CONF.keystone_authtoken
keystone_auth_url = '%s://%s:%s/v2.0/' % (keystone_conf.auth_protocol,
Expand Down

0 comments on commit f342f25

Please sign in to comment.