Skip to content

Commit

Permalink
Fix Port labels for docker VMs incorrect
Browse files Browse the repository at this point in the history
  • Loading branch information
julien-duponchelle committed Jan 11, 2017
1 parent 82c9941 commit 1bf54bc
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
4 changes: 3 additions & 1 deletion gns3server/controller/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,9 @@ def _list_ports(self):
elif self._node_type == "dynamips":
self._ports = DynamipsPortFactory(self._properties)
return
elif self._node_type == "docker":
for adapter_number in range(0, self._properties["adapters"]):
self._ports.append(PortFactory("eth{}".format(adapter_number), 0, adapter_number, 0, "ethernet", short_name="eth{}".format(adapter_number)))
elif self._node_type in ("ethernet_switch", "ethernet_hub"):
# Basic node we don't want to have adapter number
port_number = 0
Expand All @@ -573,7 +576,6 @@ def _list_ports(self):
port_number += 1
else:
self._ports = StandardPortFactory(self._properties, self._port_by_adapter, self._first_port_name, self._port_name_format, self._port_segment_size)
return

def __repr__(self):
return "<gns3server.controller.Node {} {}>".format(self._node_type, self._name)
Expand Down
26 changes: 26 additions & 0 deletions tests/controller/test_node_port_name.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,32 @@ def test_list_ports_vpcs(node):
]


def test_list_ports_docker(node):
"""
List port by default
"""
node._node_type = "docker"
node._properties["adapters"] = 2
assert node.__json__()["ports"] == [
{
"name": "eth0",
"short_name": "eth0",
"data_link_types": {"Ethernet": "DLT_EN10MB"},
"port_number": 0,
"adapter_number": 0,
"link_type": "ethernet"
},
{
"name": "eth1",
"short_name": "eth1",
"data_link_types": {"Ethernet": "DLT_EN10MB"},
"port_number": 0,
"adapter_number": 1,
"link_type": "ethernet"
}
]


def test_list_ports_port_name_format(node):
"""
Support port name format
Expand Down

0 comments on commit 1bf54bc

Please sign in to comment.