X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fdcemulator%2Fnode.py;h=3a4fbc24997319a899637e3407866dbf27130c92;hb=23135a50fd84f05f34241ab88b786dbc165463b4;hp=6030153bcb925a07eb3a4250a15e58f34744bec3;hpb=e26487ba6b33c22a1e3f5f843364df9f0efc07eb;p=osm%2Fvim-emu.git diff --git a/src/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py index 6030153..3a4fbc2 100755 --- a/src/emuvim/dcemulator/node.py +++ b/src/emuvim/dcemulator/node.py @@ -4,7 +4,13 @@ Distributed Cloud Emulator (dcemulator) """ from mininet.node import Docker from mininet.link import Link +from emuvim.dcemulator.resourcemodel import NotEnoughResourcesAvailable import logging +import time +import json + +LOG = logging.getLogger("dcemulator") +LOG.setLevel(logging.DEBUG) DCDPID_BASE = 1000 # start of switch dpid's used for data center switches @@ -21,9 +27,9 @@ class EmulatorCompute(Docker): def __init__( self, name, dimage, **kwargs): - logging.debug("Create EmulatorCompute instance: %s" % name) - self.datacenter = None # pointer to current DC - + self.datacenter = kwargs.get("datacenter") # pointer to current DC + self.flavor_name = kwargs.get("flavor_name") + LOG.debug("Starting compute instance %r in data center %r" % (name, str(self.datacenter))) # call original Docker.__init__ Docker.__init__(self, name, dimage, **kwargs) @@ -44,6 +50,7 @@ class EmulatorCompute(Docker): status["name"] = self.name status["network"] = self.getNetworkStatus() status["image"] = self.dimage + status["flavor_name"] = self.flavor_name status["cpu_quota"] = self.cpu_quota status["cpu_period"] = self.cpu_period status["cpu_shares"] = self.cpu_shares @@ -67,7 +74,7 @@ class Datacenter(object): DC_COUNTER = 1 - def __init__(self, label, metadata={}): + def __init__(self, label, metadata={}, resource_log_path=None): self.net = None # DCNetwork to which we belong # each node (DC) has a short internal name used by Mininet # this is caused by Mininets naming limitations for swtiches etc. @@ -77,8 +84,14 @@ class Datacenter(object): self.label = label # dict to store arbitrary metadata (e.g. latitude and longitude) self.metadata = metadata - self.switch = None # first prototype assumes one "bigswitch" per DC - self.containers = {} # keep track of running containers + # path to which resource information should be logged (e.g. for experiments). None = no logging + self.resource_log_path = resource_log_path + # first prototype assumes one "bigswitch" per DC + self.switch = None + # keep track of running containers + self.containers = {} + # pointer to assigned resource model + self._resource_model = None def __repr__(self): return self.label @@ -98,12 +111,12 @@ class Datacenter(object): """ self.switch = self.net.addSwitch( "%s.s1" % self.name, dpid=hex(self._get_next_dc_dpid())[2:]) - logging.debug("created data center switch: %s" % str(self.switch)) + LOG.debug("created data center switch: %s" % str(self.switch)) def start(self): pass - def startCompute(self, name, image=None, command=None, network=None): + def startCompute(self, name, image=None, command=None, network=None, flavor_name="tiny"): """ Create a new container as compute resource and connect it to this data center. @@ -111,6 +124,7 @@ class Datacenter(object): :param image: image name (string) :param command: command (string) :param network: networks list({"ip": "10.0.0.254/8"}, {"ip": "11.0.0.254/24"}) + :param flavor_name: name of the flavor for this compute container :return: """ assert name is not None @@ -119,7 +133,7 @@ class Datacenter(object): raise Exception("Container with name %s already exists." % name) # set default parameter if image is None: - image = "ubuntu" + image = "ubuntu:trusty" if network is None: network = {} # {"ip": "10.0.0.254/8"} if isinstance(network, dict): @@ -129,14 +143,34 @@ class Datacenter(object): network.append({}) # create the container - d = self.net.addDocker("%s" % (name), dimage=image, dcmd=command) + d = self.net.addDocker( + "%s" % (name), + dimage=image, + dcmd=command, + datacenter=self, + flavor_name=flavor_name + ) + + # apply resource limits to container if a resource model is defined + if self._resource_model is not None: + try: + self._resource_model.allocate(d) + self._resource_model.write_allocation_log(d, self.resource_log_path) + except NotEnoughResourcesAvailable as ex: + LOG.warning("Allocation of container %r was blocked by resource model." % name) + LOG.info(ex.message) + # ensure that we remove the container + self.net.removeDocker(name) + return None + # connect all given networks + # if no --net option is given, network = [{}], so 1 empty dict in the list + # this results in 1 default interface with a default ip address for nw in network: # TODO we cannot use TCLink here (see: https://github.com/mpeuster/dockernet/issues/3) self.net.addLink(d, self.switch, params1=nw, cls=Link) # do bookkeeping self.containers[name] = d - d.datacenter = self return d # we might use UUIDs for naming later on def stopCompute(self, name): @@ -146,10 +180,21 @@ class Datacenter(object): assert name is not None if name not in self.containers: raise Exception("Container with name %s not found." % name) + LOG.debug("Stopping compute instance %r in data center %r" % (name, str(self))) + + # call resource model and free resources + if self._resource_model is not None: + self._resource_model.free(self.containers[name]) + self._resource_model.write_free_log(self.containers[name], self.resource_log_path) + + # remove links self.net.removeLink( link=None, node1=self.containers[name], node2=self.switch) + + # remove container self.net.removeDocker("%s" % (name)) del self.containers[name] + return True def listCompute(self): @@ -170,3 +215,16 @@ class Datacenter(object): "n_running_containers": len(self.containers), "metadata": self.metadata } + + def assignResourceModel(self, rm): + """ + Assign a resource model to this DC. + :param rm: a BaseResourceModel object + :return: + """ + if self._resource_model is not None: + raise Exception("There is already an resource model assigned to this DC.") + self._resource_model = rm + self.net.rm_registrar.register(self, rm) + LOG.info("Assigned RM: %r to DC: %r" % (rm, self)) +