VOL-1397: Adtran-OLT - Initial containerization commit
- Need to move VERSION to base directory
Change-Id: I9d62d0607a011ce642e379fd92b35ec48b300070
diff --git a/adapters/adtran_olt/xpon/__init__.py b/adapters/adtran_olt/xpon/__init__.py
new file mode 100644
index 0000000..d67fcf2
--- /dev/null
+++ b/adapters/adtran_olt/xpon/__init__.py
@@ -0,0 +1,13 @@
+# Copyright 2019-present ADTRAN, Inc.
+#
+# 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.
diff --git a/adapters/adtran_olt/xpon/olt_gem_port.py b/adapters/adtran_olt/xpon/olt_gem_port.py
new file mode 100644
index 0000000..9159262
--- /dev/null
+++ b/adapters/adtran_olt/xpon/olt_gem_port.py
@@ -0,0 +1,126 @@
+#
+# Copyright 2017-present Adtran, Inc.
+#
+# 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
+import json
+
+from adapters.adtran_common.xpon.gem_port import GemPort
+from twisted.internet.defer import inlineCallbacks, returnValue
+from ..adtran_olt_handler import AdtranOltHandler
+
+log = structlog.get_logger()
+
+
+class OltGemPort(GemPort):
+ """
+ Adtran OLT specific implementation
+ """
+ def __init__(self, gem_id, alloc_id, tech_profile_id, pon_id, onu_id, uni_id,
+ encryption=False,
+ multicast=False,
+ traffic_class=None,
+ handler=None,
+ is_mock=False):
+ super(OltGemPort, self).__init__(gem_id, alloc_id, uni_id, tech_profile_id,
+ encryption=encryption,
+ multicast=multicast,
+ traffic_class=traffic_class,
+ handler=handler,
+ is_mock=is_mock)
+ self._timestamp = None
+ self._pon_id = pon_id
+ self._onu_id = onu_id # None if this is a multicast GEM Port
+
+ def __str__(self):
+ return "GemPort: {}/{}/{}, alloc-id: {}, gem-id: {}".format(self.pon_id, self.onu_id,
+ self.uni_id, self.alloc_id,
+ self.gem_id)
+
+ @staticmethod
+ def create(handler, gem, alloc_id, tech_profile_id, pon_id, onu_id, uni_id, _ofp_port_no):
+ return OltGemPort(gem.gemport_id,
+ alloc_id,
+ tech_profile_id,
+ pon_id, onu_id, uni_id,
+ encryption=gem.aes_encryption.lower() == 'true',
+ handler=handler,
+ multicast=False)
+
+ @property
+ def pon_id(self):
+ return self._pon_id
+
+ @property
+ def onu_id(self):
+ return self._onu_id
+
+ @property
+ def timestamp(self):
+ return self._timestamp
+
+ @timestamp.setter
+ def timestamp(self, value):
+ self._timestamp = value
+
+ @property
+ def encryption(self):
+ return self._encryption
+
+ @encryption.setter
+ def encryption(self, value):
+ assert isinstance(value, bool), 'encryption is a boolean'
+
+ if self._encryption != value:
+ self._encryption = value
+ self.set_config(self._handler.rest_client, 'encryption', value)
+
+ @inlineCallbacks
+ def add_to_hardware(self, session, operation='POST'):
+ if self._is_mock:
+ returnValue('mock')
+
+ uri = AdtranOltHandler.GPON_GEM_CONFIG_LIST_URI.format(self.pon_id, self.onu_id)
+ data = json.dumps(self.to_dict())
+ name = 'gem-port-create-{}-{}: {}/{}'.format(self.pon_id, self.onu_id,
+ self.gem_id,
+ self.alloc_id)
+ try:
+ results = yield session.request(operation, uri, data=data, name=name)
+ returnValue(results)
+
+ except Exception as e:
+ if operation == 'POST':
+ returnValue(self.add_to_hardware(session, operation='PATCH'))
+ else:
+ log.exception('add-2-hw', gem=self, e=e)
+ raise
+
+ def remove_from_hardware(self, session):
+ if self._is_mock:
+ returnValue('mock')
+
+ uri = AdtranOltHandler.GPON_GEM_CONFIG_URI.format(self.pon_id, self.onu_id, self.gem_id)
+ name = 'gem-port-delete-{}-{}: {}'.format(self.pon_id, self.onu_id, self.gem_id)
+ return session.request('DELETE', uri, name=name)
+
+ def set_config(self, session, leaf, value):
+ from ..adtran_olt_handler import AdtranOltHandler
+
+ data = json.dumps({leaf: value})
+ uri = AdtranOltHandler.GPON_GEM_CONFIG_URI.format(self.pon_id,
+ self.onu_id,
+ self.gem_id)
+ name = 'onu-set-config-{}-{}-{}'.format(self._pon_id, leaf, str(value))
+ return session.request('PATCH', uri, data=data, name=name)
diff --git a/adapters/adtran_olt/xpon/olt_tcont.py b/adapters/adtran_olt/xpon/olt_tcont.py
new file mode 100644
index 0000000..db31543
--- /dev/null
+++ b/adapters/adtran_olt/xpon/olt_tcont.py
@@ -0,0 +1,90 @@
+# Copyright 2017-present Adtran, Inc.
+#
+# 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
+import json
+from twisted.internet.defer import inlineCallbacks, returnValue
+from adapters.adtran_common.xpon.tcont import TCont
+# from python.adapters.openolt.protos import openolt_pb2
+from olt_traffic_descriptor import OltTrafficDescriptor
+from ..adtran_olt_handler import AdtranOltHandler
+
+log = structlog.get_logger()
+
+
+class OltTCont(TCont):
+ """
+ Adtran OLT specific implementation
+ """
+ def __init__(self, alloc_id, tech_profile_id, traffic_descriptor, pon_id, onu_id, uni_id, is_mock=False):
+ super(OltTCont, self).__init__(alloc_id, tech_profile_id, traffic_descriptor, uni_id, is_mock=is_mock)
+ self.pon_id = pon_id
+ self.onu_id = onu_id
+
+ def __str__(self):
+ return "TCont: {}/{}/{}, alloc-id: {}".format(self.pon_id, self.onu_id,
+ self.uni_id, self.alloc_id)
+
+ @staticmethod
+ def create(tcont, pon_id, onu_id, tech_profile_id, uni_id, ofp_port_no):
+ # Only valid information in the upstream tcont of a tech profile
+ if tcont.direction != openolt_pb2.UPSTREAM:
+ return None
+
+ td = OltTrafficDescriptor.create(tcont, pon_id, onu_id, uni_id, ofp_port_no)
+ return OltTCont(tcont.alloc_id, tech_profile_id, td, pon_id, onu_id, uni_id)
+
+ @inlineCallbacks
+ def add_to_hardware(self, session):
+ if self._is_mock:
+ returnValue('mock')
+
+ uri = AdtranOltHandler.GPON_TCONT_CONFIG_LIST_URI.format(self.pon_id, self.onu_id)
+ data = json.dumps({'alloc-id': self.alloc_id})
+ name = 'tcont-create-{}-{}: {}'.format(self.pon_id, self.onu_id, self.alloc_id)
+
+ # For TCONT, only leaf is the key. So only post needed
+ try:
+ results = yield session.request('POST', uri, data=data, name=name,
+ suppress_error=False)
+ except Exception as _e:
+ results = None
+
+ if self.traffic_descriptor is not None:
+ try:
+ results = yield self.traffic_descriptor.add_to_hardware(session)
+
+ except Exception as e:
+ log.exception('traffic-descriptor', tcont=self,
+ td=self.traffic_descriptor, e=e)
+ raise
+
+ returnValue(results)
+
+ def remove_from_hardware(self, session):
+ if self._is_mock:
+ returnValue('mock')
+
+ uri = AdtranOltHandler.GPON_TCONT_CONFIG_URI.format(self.pon_id, self.onu_id, self.alloc_id)
+ name = 'tcont-delete-{}-{}: {}'.format(self.pon_id, self.onu_id, self.alloc_id)
+ return session.request('DELETE', uri, name=name)
+
+
+
+
+
+
+
+
+
diff --git a/adapters/adtran_olt/xpon/olt_traffic_descriptor.py b/adapters/adtran_olt/xpon/olt_traffic_descriptor.py
new file mode 100644
index 0000000..c6d90cf
--- /dev/null
+++ b/adapters/adtran_olt/xpon/olt_traffic_descriptor.py
@@ -0,0 +1,98 @@
+# Copyright 2017-present Adtran, Inc.
+#
+# 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
+import json
+from adapters.adtran_common.xpon.traffic_descriptor import TrafficDescriptor
+from twisted.internet.defer import inlineCallbacks, returnValue
+from ..adtran_olt_handler import AdtranOltHandler
+
+log = structlog.get_logger()
+
+
+class OltTrafficDescriptor(TrafficDescriptor):
+ """
+ Adtran ONU specific implementation
+ """
+ def __init__(self, pon_id, onu_id, alloc_id, fixed, assured, maximum,
+ additional=TrafficDescriptor.AdditionalBwEligibility.DEFAULT,
+ best_effort=None,
+ is_mock=False):
+ super(OltTrafficDescriptor, self).__init__(fixed, assured, maximum,
+ additional=additional,
+ best_effort=best_effort)
+ self.pon_id = pon_id
+ self.onu_id = onu_id
+ self.alloc_id = alloc_id
+ self._is_mock = is_mock
+
+ @staticmethod
+ def create(tcont, pon_id, onu_id, _uni_id, _ofp_port_no):
+ alloc_id = tcont.alloc_id
+ shaping_info = tcont.traffic_shaping_info
+ fixed = shaping_info.cir
+ assured = 0
+ maximum = shaping_info.pir
+
+ best_effort = None
+ # if shaping_info.add_bw_ind == openolt_pb2.InferredAdditionBWIndication_Assured:
+ # pass
+ # TODO: Support additional BW decode
+ # elif shaping_info.add_bw_ind == openolt_pb2.InferredAdditionBWIndication_BestEffort:
+ # pass
+ # additional = TrafficDescriptor.AdditionalBwEligibility.from_value(
+ # traffic_disc['additional-bw-eligibility-indicator'])
+ #
+ # if additional == TrafficDescriptor.AdditionalBwEligibility.BEST_EFFORT_SHARING:
+ # best_effort = BestEffort(traffic_disc['maximum-bandwidth'],
+ # traffic_disc['priority'],
+ # traffic_disc['weight'])
+ # else:
+ # best_effort = None
+
+ return OltTrafficDescriptor(pon_id, onu_id, alloc_id,
+ fixed, assured, maximum, best_effort=best_effort)
+
+ @inlineCallbacks
+ def add_to_hardware(self, session):
+ # TODO: Traffic descriptors are no longer shared, save pon and onu ID to base class
+ if self._is_mock:
+ returnValue('mock')
+
+ uri = AdtranOltHandler.GPON_TCONT_CONFIG_URI.format(self.pon_id,
+ self.onu_id,
+ self.alloc_id)
+ data = json.dumps({'traffic-descriptor': self.to_dict()})
+ name = 'tcont-td-{}-{}: {}'.format(self.pon_id, self.onu_id, self.alloc_id)
+ try:
+ results = yield session.request('PATCH', uri, data=data, name=name)
+
+ except Exception as e:
+ log.exception('traffic-descriptor', td=self, e=e)
+ raise
+
+ # TODO: Add support for best-effort sharing
+ # if self.additional_bandwidth_eligibility == \
+ # TrafficDescriptor.AdditionalBwEligibility.BEST_EFFORT_SHARING:
+ # if self.best_effort is None:
+ # raise ValueError('TCONT is best-effort but does not define best effort sharing')
+ #
+ # try:
+ # results = yield self.best_effort.add_to_hardware(session)
+ #
+ # except Exception as e:
+ # log.exception('best-effort', best_effort=self.best_effort, e=e)
+ # raise
+
+ returnValue(results)