From 53337bc9b5cd5b6c613453b04c4f9cd703a61344 Mon Sep 17 00:00:00 2001 From: peusterm Date: Tue, 8 Mar 2016 10:11:48 +0100 Subject: [PATCH] Re-structured API modules. Now prepared to have different kinds of cloud APIs. Added empty module for SONATA fake gatekeeper for y1 demo. --- src/emuvim/api/openstack/README.md | 1 + src/emuvim/api/sonata/__init__.py | 0 src/emuvim/api/sonata/dummygatekeeper.py | 0 src/emuvim/api/zerorpc/__init__.py | 0 .../api/{zerorpcapi.py => zerorpc/compute.py} | 0 .../network.py} | 207 +++++++++--------- src/emuvim/examples/simple_topology.py | 4 +- .../examples/sonata_y1_demo_topology_1.py | 2 +- 8 files changed, 107 insertions(+), 107 deletions(-) create mode 100644 src/emuvim/api/openstack/README.md create mode 100644 src/emuvim/api/sonata/__init__.py create mode 100644 src/emuvim/api/sonata/dummygatekeeper.py create mode 100644 src/emuvim/api/zerorpc/__init__.py rename src/emuvim/api/{zerorpcapi.py => zerorpc/compute.py} (100%) mode change 100755 => 100644 rename src/emuvim/api/{zerorpcapi_DCNetwork.py => zerorpc/network.py} (95%) mode change 100755 => 100644 diff --git a/src/emuvim/api/openstack/README.md b/src/emuvim/api/openstack/README.md new file mode 100644 index 0000000..596390e --- /dev/null +++ b/src/emuvim/api/openstack/README.md @@ -0,0 +1 @@ +This is a placeholder. This folder will contain a OpenStack/HEAT like interface to the emulator. \ No newline at end of file diff --git a/src/emuvim/api/sonata/__init__.py b/src/emuvim/api/sonata/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/emuvim/api/sonata/dummygatekeeper.py b/src/emuvim/api/sonata/dummygatekeeper.py new file mode 100644 index 0000000..e69de29 diff --git a/src/emuvim/api/zerorpc/__init__.py b/src/emuvim/api/zerorpc/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/emuvim/api/zerorpcapi.py b/src/emuvim/api/zerorpc/compute.py old mode 100755 new mode 100644 similarity index 100% rename from src/emuvim/api/zerorpcapi.py rename to src/emuvim/api/zerorpc/compute.py diff --git a/src/emuvim/api/zerorpcapi_DCNetwork.py b/src/emuvim/api/zerorpc/network.py old mode 100755 new mode 100644 similarity index 95% rename from src/emuvim/api/zerorpcapi_DCNetwork.py rename to src/emuvim/api/zerorpc/network.py index 27527aa..f232166 --- a/src/emuvim/api/zerorpcapi_DCNetwork.py +++ b/src/emuvim/api/zerorpc/network.py @@ -1,104 +1,103 @@ -""" -Distributed Cloud Emulator (dcemulator) -(c) 2015 by Manuel Peuster -""" - -import logging -import threading -import zerorpc - - -logging.basicConfig(level=logging.INFO) - - -class ZeroRpcApiEndpointDCNetwork(object): - """ - Simple API endpoint that offers a zerorpc-based - interface. This interface will be used by the - default command line client. - It can be used as a reference to implement - REST interfaces providing the same semantics, - like e.g. OpenStack compute API. - """ - - def __init__(self, listenip, port, DCNetwork=None): - if DCNetwork : - self.connectDCNetwork(DCNetwork) - self.ip = listenip - self.port = port - logging.debug("Created monitoring API endpoint %s(%s:%d)" % ( - self.__class__.__name__, self.ip, self.port)) - - def connectDCNetwork(self, net): - self.net = net - logging.info("Connected DCNetwork to API endpoint %s(%s:%d)" % ( - self.__class__.__name__, self.ip, self.port)) - - def start(self): - thread = threading.Thread(target=self._api_server_thread, args=()) - thread.daemon = True - thread.start() - logging.debug("Started API endpoint %s(%s:%d)" % ( - self.__class__.__name__, self.ip, self.port)) - - def _api_server_thread(self): - s = zerorpc.Server(DCNetworkApi(self.net)) - s.bind("tcp://%s:%d" % (self.ip, self.port)) - s.run() - - def stop(self): - logging.info("Stop the monitoring API endpoint") - return - - -class DCNetworkApi(object): - """ - The networking and monitoring commands need the scope of the - whole DC network to find the requested vnf. So this API is intended - to work with a DCNetwork. - Just pass through the corresponding request to the - selected data center network. Do not implement provisioning - logic here because will will have multiple API - endpoint implementations at the end. - """ - - def __init__(self, net): - self.net = net - - def network_action_start(self, vnf_src_name, vnf_dst_name): - # call DCNetwork method, not really datacenter specific API for now... - # provided dc name needs to be part of API endpoint - # no check if vnfs are really connected to this datacenter... - logging.debug("RPC CALL: network chain start") - try: - c = self.net.setChain( - vnf_src_name, vnf_dst_name) - return str(c) - except Exception as ex: - logging.exception("RPC error.") - return ex.message - - def network_action_stop(self, vnf_src_name, vnf_dst_name): - # call DCNetwork method, not really datacenter specific API for now... - # provided dc name needs to be part of API endpoint - # no check if vnfs are really connected to this datacenter... - logging.debug("RPC CALL: network chain stop") - try: - c = self.net.setChain( - vnf_src_name, vnf_dst_name, cmd='del-flows') - return c - except Exception as ex: - logging.exception("RPC error.") - return ex.message - - # get egress(default) or ingress rate of a vnf - def monitor_get_rate(self, vnf_name, direction): - logging.debug("RPC CALL: get rate") - try: - c = self.net.monitor_agent.get_rate(vnf_name, direction) - return c - except Exception as ex: - logging.exception("RPC error.") - return ex.message - - +""" +Distributed Cloud Emulator (dcemulator) +""" + +import logging +import threading +import zerorpc + + +logging.basicConfig(level=logging.INFO) + + +class ZeroRpcApiEndpointDCNetwork(object): + """ + Simple API endpoint that offers a zerorpc-based + interface. This interface will be used by the + default command line client. + It can be used as a reference to implement + REST interfaces providing the same semantics, + like e.g. OpenStack compute API. + """ + + def __init__(self, listenip, port, DCNetwork=None): + if DCNetwork : + self.connectDCNetwork(DCNetwork) + self.ip = listenip + self.port = port + logging.debug("Created monitoring API endpoint %s(%s:%d)" % ( + self.__class__.__name__, self.ip, self.port)) + + def connectDCNetwork(self, net): + self.net = net + logging.info("Connected DCNetwork to API endpoint %s(%s:%d)" % ( + self.__class__.__name__, self.ip, self.port)) + + def start(self): + thread = threading.Thread(target=self._api_server_thread, args=()) + thread.daemon = True + thread.start() + logging.debug("Started API endpoint %s(%s:%d)" % ( + self.__class__.__name__, self.ip, self.port)) + + def _api_server_thread(self): + s = zerorpc.Server(DCNetworkApi(self.net)) + s.bind("tcp://%s:%d" % (self.ip, self.port)) + s.run() + + def stop(self): + logging.info("Stop the monitoring API endpoint") + return + + +class DCNetworkApi(object): + """ + The networking and monitoring commands need the scope of the + whole DC network to find the requested vnf. So this API is intended + to work with a DCNetwork. + Just pass through the corresponding request to the + selected data center network. Do not implement provisioning + logic here because will will have multiple API + endpoint implementations at the end. + """ + + def __init__(self, net): + self.net = net + + def network_action_start(self, vnf_src_name, vnf_dst_name): + # call DCNetwork method, not really datacenter specific API for now... + # provided dc name needs to be part of API endpoint + # no check if vnfs are really connected to this datacenter... + logging.debug("RPC CALL: network chain start") + try: + c = self.net.setChain( + vnf_src_name, vnf_dst_name) + return str(c) + except Exception as ex: + logging.exception("RPC error.") + return ex.message + + def network_action_stop(self, vnf_src_name, vnf_dst_name): + # call DCNetwork method, not really datacenter specific API for now... + # provided dc name needs to be part of API endpoint + # no check if vnfs are really connected to this datacenter... + logging.debug("RPC CALL: network chain stop") + try: + c = self.net.setChain( + vnf_src_name, vnf_dst_name, cmd='del-flows') + return c + except Exception as ex: + logging.exception("RPC error.") + return ex.message + + # get egress(default) or ingress rate of a vnf + def monitor_get_rate(self, vnf_name, direction): + logging.debug("RPC CALL: get rate") + try: + c = self.net.monitor_agent.get_rate(vnf_name, direction) + return c + except Exception as ex: + logging.exception("RPC error.") + return ex.message + + diff --git a/src/emuvim/examples/simple_topology.py b/src/emuvim/examples/simple_topology.py index 8f14b69..eb52cb1 100755 --- a/src/emuvim/examples/simple_topology.py +++ b/src/emuvim/examples/simple_topology.py @@ -19,8 +19,8 @@ script. import logging from mininet.log import setLogLevel from emuvim.dcemulator.net import DCNetwork -from emuvim.api.zerorpcapi import ZeroRpcApiEndpoint -from emuvim.api.zerorpcapi_DCNetwork import ZeroRpcApiEndpointDCNetwork +from emuvim.api.zerorpc.compute import ZeroRpcApiEndpoint +from emuvim.api.zerorpc.network import ZeroRpcApiEndpointDCNetwork logging.basicConfig(level=logging.INFO) diff --git a/src/emuvim/examples/sonata_y1_demo_topology_1.py b/src/emuvim/examples/sonata_y1_demo_topology_1.py index 1588190..5145543 100644 --- a/src/emuvim/examples/sonata_y1_demo_topology_1.py +++ b/src/emuvim/examples/sonata_y1_demo_topology_1.py @@ -7,7 +7,7 @@ A simple topology with two PoPs for the y1 demo story board. import logging from mininet.log import setLogLevel from emuvim.dcemulator.net import DCNetwork -from emuvim.api.zerorpcapi import ZeroRpcApiEndpoint +from emuvim.api.zerorpc.compute import ZeroRpcApiEndpoint logging.basicConfig(level=logging.INFO) -- 2.25.1