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

Merge branch '2.1'

Browse Source 
# Conflicts:
#	gns3server/compute/dynamips/nodes/atm_switch.py
This commit is contained in:
grossmj committed 2019-09-30 16:11:26 +08:00
2 parents 87390274cc 67e70c4628
commit af3ae0df24
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gns3server/compute/dynamips/nodes/atm_switch.py
+1 -1
View File
@@ -81,7 +81,7 @@ class ATMSwitch(Device):
:param new_name: New name for this switch
"""
await self._hypervisor.send('atm rename "{name}" "{new_name}"'.format(name=self._name, new_name=new_name))
await self._hypervisor.send('atmsw rename "{name}" "{new_name}"'.format(name=self._name, new_name=new_name))
log.info('ATM switch "{name}" [{id}]: renamed to "{new_name}"'.format(name=self._name,
id=self._id,
new_name=new_name))
gns3server/controller/node.py
+1 -1
View File
@@ -100,7 +100,7 @@ class Node:
try:
setattr(self, prop, kwargs[prop])
except AttributeError as e:
log.critical("Cannot set attribute '%s'".format(prop))
log.critical("Cannot set attribute '{}'".format(prop))
raise e
else:
if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "":