ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-02-07 03:29:14 +00:00
Code Issues Actions 1 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 2019-09-30 16:11:26 +08:00
commit af3ae0df24
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/dynamips/nodes/atm_switch.py
View File

@ -81,7 +81,7 @@ class ATMSwitch(Device):
:param new_name: New name for this switch :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, log.info('ATM switch "{name}" [{id}]: renamed to "{new_name}"'.format(name=self._name,
id=self._id, id=self._id,
new_name=new_name)) new_name=new_name))

2
gns3server/controller/node.py
View File

@ -100,7 +100,7 @@ class Node:
try: try:
setattr(self, prop, kwargs[prop]) setattr(self, prop, kwargs[prop])
except AttributeError as e: except AttributeError as e:
log.critical("Cannot set attribute '%s'".format(prop)) log.critical("Cannot set attribute '{}'".format(prop))
raise e raise e
else: else:
if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "": if prop not in self.CONTROLLER_ONLY_PROPERTIES and kwargs[prop] is not None and kwargs[prop] != "":