openstack
/
deb-python-seamicroclient
Code Issues Proposed changes

Add set/unset logic for tagged/untagged vlans for all nics 

* Adds set/unset logic to tagged/untagged vlans for all the nics
  of server.
This commit is contained in:
Harshada Mangesh Kakad 2015-01-05 00:42:23 -08:00
parent 17a503f309
commit db616fcdf8
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
seamicroclient/v2/servers.py
View File

@ -18,7 +18,7 @@ from seamicroclient import base
TAGGED_VLAN = "taggedVlans"
UNTAGGED_VLAN = "untaggedVlans"
UNTAGGED_VLAN = "untaggedVlan"
class Server(base.Resource):
@ -33,17 +33,17 @@ class Server(base.Resource):
def reset(self, using_pxe=False):
self.manager.reset(self, using_pxe)
def set_tagged_vlan(self, vlan_id, **kwargs):
self.manager.set_tagged_vlan(self, vlan_id, **kwargs)
def set_tagged_vlan(self, vlan_id, all_nics=False, **kwargs):
self.manager.set_tagged_vlan(self, vlan_id, all_nics, **kwargs)
def unset_tagged_vlan(self, vlan_id, **kwargs):
self.manager.unset_tagged_vlan(self, vlan_id, **kwargs)
def unset_tagged_vlan(self, vlan_id, all_nics=False, **kwargs):
self.manager.unset_tagged_vlan(self, vlan_id, all_nics, **kwargs)
def set_untagged_vlan(self, vlan_id, **kwargs):
self.manager.set_untagged_vlan(self, vlan_id, **kwargs)
def set_untagged_vlan(self, vlan_id, all_nics=False, **kwargs):
self.manager.set_untagged_vlan(self, vlan_id, all_nics, **kwargs)
def unset_untagged_vlan(self, vlan_id, **kwargs):
self.manager.unset_untagged_vlan(self, vlan_id, **kwargs)
def unset_untagged_vlan(self, vlan_id, all_nics=False, **kwargs):
self.manager.unset_untagged_vlan(self, vlan_id, all_nics, **kwargs)
def attach_volume(self, volume, vdisk=0, **kwargs):
self.manager.attach_volume(self, volume, vdisk, **kwargs)
@ -138,44 +138,44 @@ class ServerManager(base.ManagerWithFind):
action_params = {"using-pxe": using_pxe}
self._action('reset', server, action_params)
def set_tagged_vlan(self, server, vlan_id, **kwargs):
def set_tagged_vlan(self, server, vlan_id, all_nics=False, **kwargs):
"""
Set the tagged vlan id for the server.
:param server: The :class:`Server` (or its ID) to power on.
:param vlan_id: The tagged vlan id for the server.
"""
self._handle_vlan(server, vlan_id, TAGGED_VLAN, **kwargs)
self._handle_vlan(server, vlan_id, TAGGED_VLAN, all_nics, **kwargs)
def unset_tagged_vlan(self, server, vlan_id, **kwargs):
def unset_tagged_vlan(self, server, vlan_id, all_nics=False, **kwargs):
"""
Unset the tagged vlan id for the server.
:param server: The :class:`Server` (or its ID) to power on.
:param vlan_id: The tagged vlan id for the server.
"""
self._handle_vlan(server, vlan_id, TAGGED_VLAN, unset=True, **kwargs)
self._handle_vlan(server, vlan_id, TAGGED_VLAN, all_nics, unset=True, **kwargs)
def set_untagged_vlan(self, server, vlan_id, **kwargs):
def set_untagged_vlan(self, server, vlan_id, all_nics=False, **kwargs):
"""
Set the untagged vlan id for the server.
:param server: The :class:`Server` (or its ID) to power on.
:param vlan_id: The untagged vlan id for the server.
"""
self._handle_vlan(server, vlan_id, UNTAGGED_VLAN, **kwargs)
self._handle_vlan(server, vlan_id, UNTAGGED_VLAN, all_nics, **kwargs)
def unset_untagged_vlan(self, server, vlan_id, **kwargs):
def unset_untagged_vlan(self, server, vlan_id, all_nics=False, **kwargs):
"""
Unset the untagged vlan id for the server.
:param server: The :class:`Server` (or its ID) to power on.
:param vlan_id: The untagged vlan id for the server.
"""
self._handle_vlan(server, vlan_id, UNTAGGED_VLAN,
self._handle_vlan(server, vlan_id, UNTAGGED_VLAN, all_nics,
unset=True, **kwargs)
def _handle_vlan(self, server, vlan_id, vlan_type, unset=False, **kwargs):
def _handle_vlan(self, server, vlan_id, vlan_type, all_nics=False, unset=False, **kwargs):
"""
Set/Unset tagged/untagged vlan id for the server.
@ -192,8 +192,14 @@ class ServerManager(base.ManagerWithFind):
else:
action_params.update({'add': vlan_id})
self.run_hooks('modify_body_for_action', action_params, **kwargs)
url = '/servers/%s/nic/0/%s' % (base.getid(server), vlan_type)
return self.api.client.put(url, body=action_params)
if all_nics:
for nic in range(0,8):
url = '/servers/%s/nic/%s/%s' % (base.getid(server), nic, vlan_type)
self.api.client.put(url, body=action_params)
return
else:
url = '/servers/%s/nic/0/%s' % (base.getid(server), vlan_type)
return self.api.client.put(url, body=action_params)
def set_boot_order(self, server, boot_order="hd0", **kwargs):
"""