X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=emuvim%2Fdcemulator%2Fnet.py;h=7b238b8cdcff82d6f0951e50500ae6696ddd9348;hp=eace03a9c40d32470a1c9590cfde3630d8279354;hb=a29c50cffd72de2f5533bb4f294adfe9a0f655d5;hpb=7303abc38b4751466953c8db55815c63df6687ac diff --git a/emuvim/dcemulator/net.py b/emuvim/dcemulator/net.py old mode 100644 new mode 100755 index eace03a..7b238b8 --- a/emuvim/dcemulator/net.py +++ b/emuvim/dcemulator/net.py @@ -29,17 +29,17 @@ class DCNetwork(Dockernet): self, controller=Controller, switch=OVSKernelSwitch, **kwargs) self.addController('c0') - def addDatacenter(self, name): + def addDatacenter(self, label, metadata={}): """ Create and add a logical cloud data center to the network. """ - if name in self.dcs: - raise Exception("Data center name already exists: %s" % name) - dc = Datacenter(name) + if label in self.dcs: + raise Exception("Data center label already exists: %s" % label) + dc = Datacenter(label, metadata=metadata) dc.net = self # set reference to network - self.dcs[name] = dc + self.dcs[label] = dc dc.create() # finally create the data center in our Mininet instance - logging.info("added data center: %s" % name) + logging.info("added data center: %s" % label) return dc def addLink(self, node1, node2, **params): @@ -76,11 +76,11 @@ class DCNetwork(Dockernet): return Dockernet.addLink(self, node1, node2, **params) # TODO we need TCLinks with user defined performance here - def addDocker( self, name, **params ): + def addDocker( self, label, **params ): """ Wrapper for addDocker method to use custom container class. """ - return Dockernet.addDocker(self, name, cls=EmulatorCompute, **params) + return Dockernet.addDocker(self, label, cls=EmulatorCompute, **params) def getAllContainers(self): """