NgTech-LTD/gns3-server
2
0 Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-11-03 14:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change rename command to a name property setter for all Dynamips

Browse Source 
devices. Adjust the tests and upload the new dynamips that supports the
rename command for VMs.
This commit is contained in:
grossmj committed 2014-02-05 15:45:33 -07:00
1 parent cef29e53aa
commit 5560e81f9a
17 files changed
+117 -109
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/modules/dynamips/__init__.py
+2 -1
View File
@@ -118,7 +118,8 @@ class Dynamips(IModule):
"""
# stop all Dynamips hypervisors
self._hypervisor_manager.stop_all_hypervisors()
if self._hypervisor_manager:
self._hypervisor_manager.stop_all_hypervisors()
# resets the instance counters
Router.reset()
gns3server/modules/dynamips/hypervisor_manager.py
+1 -1
View File
@@ -472,7 +472,7 @@ class HypervisorManager(object):
hypervisor.port,
current_memory_load,
router_ram))
return hypervisor
return hypervisor
hypervisor = self.start_new_hypervisor()
hypervisor.image_ref = router_ios_image
gns3server/modules/dynamips/nodes/atm_bridge.py
+13 -12
View File
@@ -51,6 +51,19 @@ class ATMBridge(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this ATM bridge.
:param new_name: New name for this bridge
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("atm_bridge rename {name} {new_name}".format(name=self._name,
new_name=new_name))
self._name = new_name
@property
def hypervisor(self):
"""
@@ -90,18 +103,6 @@ class ATMBridge(object):
return self._mapping
def rename(self, new_name):
"""
Renames this ATM bridge.
:param new_name: New name for this bridge
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("atm_bridge rename {name} {new_name}".format(name=self._name,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this ATM bridge.
gns3server/modules/dynamips/nodes/atm_switch.py
+18 -17
View File
@@ -86,6 +86,24 @@ class ATMSwitch(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this ATM switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("atmsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("ATM switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
@property
def hypervisor(self):
"""
@@ -125,23 +143,6 @@ class ATMSwitch(object):
return self._mapping
def rename(self, new_name):
"""
Renames this ATM switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("atmsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("ATM switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this ATM switch.
gns3server/modules/dynamips/nodes/bridge.py
+14 -13
View File
@@ -49,6 +49,20 @@ class Bridge(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this bridge.
:param new_name: New name for this bridge
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("nio_bridge rename {name} {new_name}".format(name=self._name,
new_name=new_name))
self._name = new_name
@property
def hypervisor(self):
"""
@@ -78,19 +92,6 @@ class Bridge(object):
return self._nios
def rename(self, new_name):
"""
Renames this bridge.
:param new_name: New name for this bridge
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("nio_bridge rename {name} {new_name}".format(name=self._name,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this bridge.
gns3server/modules/dynamips/nodes/ethernet_switch.py
+18 -17
View File
@@ -87,6 +87,24 @@ class EthernetSwitch(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this Ethernet switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("ethsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("Ethernet switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
@property
def hypervisor(self):
"""
@@ -126,23 +144,6 @@ class EthernetSwitch(object):
return self._mapping
def rename(self, new_name):
"""
Renames this Ethernet switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("ethsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("Ethernet switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this Ethernet switch.
gns3server/modules/dynamips/nodes/frame_relay_switch.py
+18 -17
View File
@@ -86,6 +86,24 @@ class FrameRelaySwitch(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this Frame Relay switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("frsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("Frame Relay switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
@property
def hypervisor(self):
"""
@@ -125,23 +143,6 @@ class FrameRelaySwitch(object):
return self._mapping
def rename(self, new_name):
"""
Renames this Frame Relay switch.
:param new_name: New name for this switch
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("frsw rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("Frame Relay switch {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this Frame Relay switch.
gns3server/modules/dynamips/nodes/router.py
+18 -17
View File
@@ -163,6 +163,24 @@ class Router(object):
return self._name[1:-1] # remove quotes
@name.setter
def name(self, new_name):
"""
Renames this router.
:param new_name: new name string
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("vm rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("router {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
@property
def platform(self):
"""
@@ -202,23 +220,6 @@ class Router(object):
return self._hypervisor.send("vm list_con_ports")
def rename(self, new_name):
"""
Renames this router.
:param new_name: new name string
"""
new_name = '"' + new_name + '"' # put the new name into quotes to protect spaces
self._hypervisor.send("vm rename {name} {new_name}".format(name=self._name,
new_name=new_name))
log.info("router {name} [id={id}]: renamed to {new_name}".format(name=self._name,
id=self._id,
new_name=new_name))
self._name = new_name
def delete(self):
"""
Deletes this router.