X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnode.py;h=5cfc9efff545bbfec151ba54084d59c2a675be71;hb=ee5179f161d10b35a8a73f495ca3692fda9b2e71;hp=c5ac9b368d49ea34e93bacfe81db3c4a415320f7;hpb=f045c142ee82c8da93756f4addff67dbf305888b;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py index c5ac9b3..5cfc9ef 100755 --- a/src/emuvim/dcemulator/node.py +++ b/src/emuvim/dcemulator/node.py @@ -91,8 +91,10 @@ class EmulatorCompute(Docker): status["state"] = self.dcli.inspect_container(self.dc)["State"] status["id"] = self.dcli.inspect_container(self.dc)["Id"] status["short_id"] = self.dcli.inspect_container(self.dc)["Id"][:12] + status["hostname"] = self.dcli.inspect_container(self.dc)["Config"]['Hostname'] status["datacenter"] = (None if self.datacenter is None else self.datacenter.label) + return status @@ -246,6 +248,24 @@ class Datacenter(object): return True + def attachExternalSAP(self, sap_name, sap_ip): + # create SAP as OVS internal interface + sap_intf = self.switch.attachInternalIntf(sap_name, sap_ip) + + # add this as a link to the DCnetwork graph, so it is available for routing + attr_dict2 = {'src_port_id': sap_name, 'src_port_nr': None, + 'src_port_name': sap_name, + 'dst_port_id': self.switch.ports[sap_intf], 'dst_port_nr': self.switch.ports[sap_intf], + 'dst_port_name': sap_intf.name} + self.net.DCNetwork_graph.add_edge(sap_name, self.switch.name, attr_dict=attr_dict2) + + attr_dict2 = {'dst_port_id': sap_name, 'dst_port_nr': None, + 'dst_port_name': sap_name, + 'src_port_id': self.switch.ports[sap_intf], 'src_port_nr': self.switch.ports[sap_intf], + 'src_port_name': sap_intf.name} + self.net.DCNetwork_graph.add_edge(self.switch.name, sap_name, attr_dict=attr_dict2) + + def listCompute(self): """ Return a list of all running containers assigned to this