Make ponsim_olt work for asfvolt16_olt adapter.
This is the first commit where olt activate is tested.
Change-Id: Ifa3967d8650741db8feeeff1a271618408ea4da1
diff --git a/ponsim/bal_servicer.py b/ponsim/bal_servicer.py
new file mode 100644
index 0000000..f036d67
--- /dev/null
+++ b/ponsim/bal_servicer.py
@@ -0,0 +1,74 @@
+#
+# Copyright 2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import structlog
+from common.utils.grpc_utils import twisted_async
+from voltha.protos import third_party
+from voltha.protos.ponsim_pb2 import PonSimDeviceInfo
+from google.protobuf.empty_pb2 import Empty
+from voltha.adapters.asfvolt16_olt.protos.bal_pb2 import BalServicer, BalErr
+from voltha.adapters.asfvolt16_olt.protos.bal_errno_pb2 import BAL_ERR_OK
+
+_ = third_party
+
+log = structlog.get_logger()
+
+class BalHandler(BalServicer):
+
+ def __init__(self, thread_pool, ponsim):
+ self.thread_pool = thread_pool
+ self.ponsim = ponsim
+
+ @twisted_async
+ def GetDeviceInfo(self, request, context):
+ log.info('get-device-info')
+ ports = self.ponsim.get_ports()
+ return PonSimDeviceInfo(
+ nni_port=ports[0],
+ uni_ports=ports[1:]
+ )
+
+ @twisted_async
+ def UpdateFlowTable(self, request, context):
+ log.info('flow-table-update', request=request, port=request.port)
+ if request.port == 0:
+ # by convention this is the olt port
+ self.ponsim.olt_install_flows(request.flows)
+ else:
+ self.ponsim.onu_install_flows(request.port, request.flows)
+ return Empty()
+
+ def GetStats(self, request, context):
+ return self.ponsim.get_stats()
+
+ def BalApiInit(self, request, context):
+ log.info('olt-connection-successful', request=request)
+ return BalErr(err=BAL_ERR_OK)
+
+ def BalApiFinish(self, request, context):
+ log.info('BalApi', request=request)
+ return BalErr(err=BAL_ERR_OK)
+
+ def BalCfgSet(self, request, context):
+ log.info('olt-activation-successful', request=request)
+ return BalErr(err=BAL_ERR_OK)
+
+ def BalAccessTerminalCfgSet(self, request, context):
+ log.info('olt-activation-successful', request=request)
+ return BalErr(err=BAL_ERR_OK)
+
+ def BalCfgClear(self, request, context):
+ log.info('BalCfClear', request=request)
+ return BalErr(err=BAL_ERR_OK)
diff --git a/ponsim/grpc_server.py b/ponsim/grpc_server.py
index fb08346..13d0ab9 100644
--- a/ponsim/grpc_server.py
+++ b/ponsim/grpc_server.py
@@ -18,65 +18,12 @@
import os
from concurrent import futures
-from common.utils.grpc_utils import twisted_async
from voltha.protos import third_party
-from voltha.protos.ponsim_pb2 import PonSimServicer, \
- add_PonSimServicer_to_server, PonSimDeviceInfo
-from google.protobuf.empty_pb2 import Empty
-
-from voltha.protos.ponsim_pb2 import XPonSimServicer, add_XPonSimServicer_to_server
_ = third_party
log = structlog.get_logger()
-
-class FlowUpdateHandler(PonSimServicer):
-
- def __init__(self, thread_pool, ponsim):
- self.thread_pool = thread_pool
- self.ponsim = ponsim
-
- @twisted_async
- def GetDeviceInfo(self, request, context):
- log.info('get-device-info')
- ports = self.ponsim.get_ports()
- return PonSimDeviceInfo(
- nni_port=ports[0],
- uni_ports=ports[1:]
- )
-
- @twisted_async
- def UpdateFlowTable(self, request, context):
- log.info('flow-table-update', request=request, port=request.port)
- if request.port == 0:
- # by convention this is the olt port
- self.ponsim.olt_install_flows(request.flows)
- else:
- self.ponsim.onu_install_flows(request.port, request.flows)
- return Empty()
-
- def GetStats(self, request, context):
- return self.ponsim.get_stats()
-
-class XPonHandler(XPonSimServicer):
-
- def __init__(self, thread_pool, x_pon_sim):
- self.thread_pool = thread_pool
- self.x_pon_sim = x_pon_sim
-
- def CreateInterface(self, request, context):
- self.x_pon_sim.CreateInterface(request)
- return Empty()
-
- def UpdateInterface(self, request, context):
- self.x_pon_sim.UpdateInterface(request)
- return Empty()
-
- def RemoveInterface(self, request, context):
- self.x_pon_sim.RemoveInterface(request)
- return Empty()
-
class GrpcServer(object):
def __init__(self, port, ponsim, x_pon_sim):
@@ -86,12 +33,16 @@
self.ponsim = ponsim
self.x_pon_sim = x_pon_sim
- def start(self):
+ '''
+ service_list: a list of (add_xyzSimServicer_to_server, xyzServicerClass)
+ e.g. [(add_PonSimServicer_to_server, FlowUpdateHandler),
+ (add_XPonSimServicer_to_server, XPonHandler)]
+ '''
+ def start(self, service_list):
log.debug('starting')
- handler = FlowUpdateHandler(self.thread_pool, self.ponsim)
- add_PonSimServicer_to_server(handler, self.server)
- x_pon_handler = XPonHandler(self.thread_pool, self.x_pon_sim)
- add_XPonSimServicer_to_server(x_pon_handler, self.server)
+ for add_x_to_server, xServiceClass in service_list:
+ x_handler = xServiceClass(self.thread_pool, self.ponsim)
+ add_x_to_server(x_handler, self.server)
# read in key and certificate
try:
@@ -108,7 +59,6 @@
# create server credentials
server_credentials = grpc.ssl_server_credentials(((private_key, certificate_chain,),))
self.server.add_secure_port('[::]:%s' % self.port, server_credentials)
-
self.server.start()
log.info('started')
diff --git a/ponsim/main.py b/ponsim/main.py
index 3140afd..63b47f6 100755
--- a/ponsim/main.py
+++ b/ponsim/main.py
@@ -28,16 +28,21 @@
from common.structlog_setup import setup_logging
from grpc_server import GrpcServer
-from ponsim import PonSim
from realio import RealIo
-
+from voltha.protos.ponsim_pb2 import add_PonSimServicer_to_server
+from voltha.protos.ponsim_pb2 import add_XPonSimServicer_to_server
+from voltha.adapters.asfvolt16_olt.protos.bal_pb2 import add_BalServicer_to_server
+import ponsim_servicer
+import bal_servicer
+from ponsim import PonSim
from ponsim import XPonSim
defs = dict(
config=os.environ.get('CONFIG', './ponsim.yml'),
grpc_port=int(os.environ.get('GRPC_PORT', 50060)),
name=os.environ.get('NAME', 'pon1'),
- onus=int(os.environ.get("ONUS", 1))
+ onus=int(os.environ.get("ONUS", 1)),
+ device_type='ponsim'
)
@@ -139,6 +144,14 @@
default=False,
help=_help)
+ _help = ('device type - ponsim or bal'
+ ' (default: %s)' % defs['device_type'])
+ parser.add_argument('-d', '--device_type',
+ dest='device_type',
+ action='store',
+ default=defs['device_type'],
+ help=_help)
+
args = parser.parse_args()
return args
@@ -169,13 +182,19 @@
if not args.no_banner:
print_banner(self.log)
- self.startup_components()
+ if args.device_type == 'ponsim':
+ grpc_services = [(add_PonSimServicer_to_server, ponsim_servicer.FlowUpdateHandler)]
+ elif args.device_type == 'bal':
+ grpc_services = [(add_BalServicer_to_server, bal_servicer.BalHandler)]
+ grpc_services.append((add_XPonSimServicer_to_server, ponsim_servicer.XPonHandler))
+
+ self.startup_components(grpc_services)
def start(self):
self.start_reactor() # will not return except Keyboard interrupt
@inlineCallbacks
- def startup_components(self):
+ def startup_components(self, grpc_services):
try:
self.log.info('starting-internal-components')
@@ -188,7 +207,7 @@
self.x_pon_sim = XPonSim()
self.grpc_server = GrpcServer(self.args.grpc_port, self.ponsim, self.x_pon_sim)
- yield self.grpc_server.start()
+ yield self.grpc_server.start(grpc_services)
self.log.info('started-internal-services')
diff --git a/ponsim/ponsim_servicer.py b/ponsim/ponsim_servicer.py
new file mode 100644
index 0000000..b7a524f
--- /dev/null
+++ b/ponsim/ponsim_servicer.py
@@ -0,0 +1,71 @@
+#
+# Copyright 2017 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+import structlog
+from common.utils.grpc_utils import twisted_async
+from voltha.protos import third_party
+from voltha.protos.ponsim_pb2 import PonSimServicer, PonSimDeviceInfo
+from google.protobuf.empty_pb2 import Empty
+from voltha.protos.ponsim_pb2 import XPonSimServicer
+
+_ = third_party
+
+log = structlog.get_logger()
+
+class FlowUpdateHandler(PonSimServicer):
+
+ def __init__(self, thread_pool, ponsim):
+ self.thread_pool = thread_pool
+ self.ponsim = ponsim
+
+ @twisted_async
+ def GetDeviceInfo(self, request, context):
+ log.info('get-device-info')
+ ports = self.ponsim.get_ports()
+ return PonSimDeviceInfo(
+ nni_port=ports[0],
+ uni_ports=ports[1:]
+ )
+
+ @twisted_async
+ def UpdateFlowTable(self, request, context):
+ log.info('flow-table-update', request=request, port=request.port)
+ if request.port == 0:
+ # by convention this is the olt port
+ self.ponsim.olt_install_flows(request.flows)
+ else:
+ self.ponsim.onu_install_flows(request.port, request.flows)
+ return Empty()
+
+ def GetStats(self, request, context):
+ return self.ponsim.get_stats()
+
+class XPonHandler(XPonSimServicer):
+
+ def __init__(self, thread_pool, x_pon_sim):
+ self.thread_pool = thread_pool
+ self.x_pon_sim = x_pon_sim
+
+ def CreateInterface(self, request, context):
+ self.x_pon_sim.CreateInterface(request)
+ return Empty()
+
+ def UpdateInterface(self, request, context):
+ self.x_pon_sim.UpdateInterface(request)
+ return Empty()
+
+ def RemoveInterface(self, request, context):
+ self.x_pon_sim.RemoveInterface(request)
+ return Empty()