Merge "Setting log level at info and using rw-core/ofagent test images"
diff --git a/jjb/verify/abstract-olt.yaml b/jjb/verify/abstract-olt.yaml
deleted file mode 100644
index fcd9bff..0000000
--- a/jjb/verify/abstract-olt.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-# verification jobs for 'abstract-olt' repo
-
-- project:
-    name: abstract-olt
-    project: '{name}'
-
-    jobs:
-      - 'verify-abstract-olt-jobs':
-          branch-regexp: '{supported-branches-regexp}'
-
-- job-group:
-    name: 'verify-abstract-olt-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'abstract-olt-tests':
-          dependency-jobs: 'verify_abstract-olt_licensed'
-
-- job-template:
-    id: 'abstract-olt-tests'
-    name: 'verify_{project}_tests'
-
-    description: |
-      Created by {id} job-template from ci-management/jjb/verify/abstract-olt.yaml
-
-    triggers:
-      - cord-infra-gerrit-trigger-patchset:
-          gerrit-server-name: '{gerrit-server-name}'
-          project-regexp: '^{project}$'
-          branch-regexp: '{branch-regexp}'
-          dependency-jobs: '{dependency-jobs}'
-          file-include-regexp: '{all-files-regexp}'
-
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: 20
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    scm:
-      - cord-infra-gerrit-scm:
-          git-url: '$GIT_URL/$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: 'false'
-          choosing-strategy: 'gerrit'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: '{project}'
-
-    node: 'ubuntu18.04-basebuild-1c-2g'
-    project-type: freestyle
-    concurrent: true
-
-    builders:
-      - shell: |
-          #!/usr/bin/env bash
-          set -eux -o pipefail
-
-          export GOPATH=~/go
-          export PATH=$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:~/go/bin
-
-          # move code the proper location
-          mkdir -p $GOPATH/src/gerrit.opencord.org
-          mv abstract-olt $GOPATH/src/gerrit.opencord.org/abstract-olt
-
-          # get prereqs
-          go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
-          go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
-          go get -v github.com/golang/protobuf/protoc-gen-go
-
-          pushd $GOPATH/src/gerrit.opencord.org/abstract-olt
-
-          make test
-
-          go test -v ./...  2>&1 | go-junit-report > $WORKSPACE/junit-report.xml
-
-          go test -coverprofile=coverage.txt -covermode=count ./...
-          gocover-cobertura < coverage.txt > $WORKSPACE/coverage.xml
-
-          popd
-
-
-    publishers:
-      - junit:
-          results: "junit-report.xml"
-      - cobertura:
-          report-file: "coverage.xml"
-          targets:
-            - files:
-                healthy: 80
-                unhealthy: 0
-                failing: 0
-            - method:
-                healthy: 50
-                unhealthy: 0
-                failing: 0
diff --git a/jjb/verify/ofagent-py.yaml b/jjb/verify/ofagent-py.yaml
deleted file mode 100644
index 333246b..0000000
--- a/jjb/verify/ofagent-py.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# verification jobs for 'ofagent-py' repo
-
-# NOTE ofagent-py is unmaintained, should we keep running tests?
-
-- project:
-    name: ofagent-py
-    project: '{name}'
-
-    jobs:
-      - 'verify-ofagent-py-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-ofagent-py-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-ofagent-py-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject'
-      - 'make-unit-test':
-          unit-test-keep-going: 'true'
-          junit-allow-empty-results: true
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
-    name: 'publish-ofagent-py-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/omci-sim.yaml b/jjb/verify/omci-sim.yaml
deleted file mode 100644
index 7d60783..0000000
--- a/jjb/verify/omci-sim.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-# verification jobs for 'omci-sim' repo
-
-- project:
-    name: omci-sim
-    project: '{name}'
-
-    jobs:
-      - 'verify-omci-sim-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-omci-sim-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_omci-sim_licensed'
-#      - 'make-unit-test':
-#         dest-gopath: "github.com/opencord"
diff --git a/jjb/verify/ponsim.yaml b/jjb/verify/ponsim.yaml
deleted file mode 100644
index 527c0cd..0000000
--- a/jjb/verify/ponsim.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# verification jobs for 'ponsim' repo
-
-- project:
-    name: ponsim
-    project: '{name}'
-
-    jobs:
-      - 'verify-ponsim-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-ponsim-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-ponsim-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_ponsim_licensed'
-      - 'make-unit-test':
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-          dest-gopath: "github.com/opencord"
-          unit-test-targets: 'test docker-build'
-          unit-test-keep-going: 'true'
-
-- job-group:
-    name: 'publish-ponsim-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/pyvoltha.yaml b/jjb/verify/pyvoltha.yaml
deleted file mode 100644
index 70cfc52..0000000
--- a/jjb/verify/pyvoltha.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'pyvoltha' repo
-
-- project:
-    name: pyvoltha
-    project: '{name}'
-
-    jobs:
-      - 'verify-pyvoltha-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-pyvoltha-jobs':
-          branch-regexp: '{all-branches-regexp}'
-          pypi-index: 'pypi'
-
-- job-group:
-    name: 'verify-pyvoltha-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_pyvoltha_licensed'
-      - 'python-unit-test':
-          dependency-jobs: 'verify_pyvoltha_tag-collision'
-
-
-- job-group:
-    name: 'publish-pyvoltha-jobs'
-    jobs:
-      - 'pypi-publish':
-          project-regexp: '^{name}$'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
deleted file mode 100644
index 5cdf7ad..0000000
--- a/jjb/verify/voltha-bbsim.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-# verification jobs for 'voltha-bbsim' repo
-
-- project:
-    name: voltha-bbsim
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-bbsim-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-bbsim-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-bbsim-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-bbsim_licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test'
-          dest-gopath: "github.com/opencord"
-          junit-allow-empty-results: true
-          build-node: 'ubuntu18.04-basebuild-1c-2g'
-
-- job-group:
-    name: 'publish-voltha-bbsim-jobs'
-    jobs:
-      - 'docker-publish':
-          maintainers: "teo@opennetworking.org"
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
deleted file mode 100644
index 564846a..0000000
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-# verification jobs for 'voltha-openonu-adapter' repo
-# NOTE this component is deprecated, should we keep running the tests?
-
-- project:
-    name: voltha-openonu-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-openonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'verify-voltha-openonu-adapter-jobs-voltha-2.8':
-          name-extension: '-voltha-2.8'
-          override-branch: 'voltha-2.8'
-          branch-regexp: '{kind-voltha-regexp}'
-      - 'verify-voltha-openonu-adapter-jobs-master':
-          branch-regexp: '^master$'
-      - 'publish-voltha-openonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-openonu-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-openonu-adapter_licensed'
-      - 'make-unit-test':
-          unit-test-targets: 'test'
-          unit-test-keep-going: 'true'
-          junit-allow-empty-results: true
-          build-timeout: 15
-      - 'make-sca':
-          unit-test-targets: 'sca'
-          unit-test-keep-going: 'true'
-          junit-allow-empty-results: true
-          build-timeout: 15
-
-- job-group:
-    name: 'verify-voltha-openonu-adapter-jobs-voltha-2.8'
-    jobs:
-      - 'voltha-patch-test':
-          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
-- job-group:
-    name: 'verify-voltha-openonu-adapter-jobs-master'
-    jobs:
-      - 'voltha-patch-test':
-          extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-
-- job-group:
-    name: 'publish-voltha-openonu-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-ponsimolt-adapter.yaml b/jjb/verify/voltha-ponsimolt-adapter.yaml
deleted file mode 100644
index 052107d..0000000
--- a/jjb/verify/voltha-ponsimolt-adapter.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'voltha-ponsimolt-adapter' repo
-
-- project:
-    name: voltha-ponsimolt-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-ponsimolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-ponsimolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-ponsimolt-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-ponsimolt-adapter_licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-keep-going: 'true'
-
-- job-group:
-    name: 'publish-voltha-ponsimolt-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-ponsimonu-adapter.yaml b/jjb/verify/voltha-ponsimonu-adapter.yaml
deleted file mode 100644
index 3f83d09..0000000
--- a/jjb/verify/voltha-ponsimonu-adapter.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'voltha-ponsimonu-adapter' repo
-
-- project:
-    name: voltha-ponsimonu-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-ponsimonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-ponsimonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-ponsimonu-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-ponsimonu-adapter_licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-keep-going: 'true'
-
-- job-group:
-    name: 'publish-voltha-ponsimonu-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-python-base.yaml b/jjb/verify/voltha-python-base.yaml
deleted file mode 100644
index ce03fb3..0000000
--- a/jjb/verify/voltha-python-base.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# verification jobs for 'voltha-python-base' repo
-
-- project:
-    name: voltha-python-base
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-python-base-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-python-base-jobs'
-
-- job-group:
-    name: 'verify-voltha-python-base-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-python-base_licensed'
-      - 'make-unit-test':
-          build-timeout: 30
-          unit-test-targets: 'docker-build'
-          junit-allow-empty-results: true
-
-- job-group:
-    name: 'publish-voltha-python-base-jobs'
-    jobs:
-      - 'docker-publish':
-          build-timeout: 30
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-simolt-adapter.yaml b/jjb/verify/voltha-simolt-adapter.yaml
deleted file mode 100644
index 41afcac..0000000
--- a/jjb/verify/voltha-simolt-adapter.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'voltha-simolt-adapter' repo
-
-- project:
-    name: voltha-simolt-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-simolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-simolt-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-simolt-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-simolt-adapter_licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-keep-going: 'true'
-
-- job-group:
-    name: 'publish-voltha-simolt-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-simonu-adapter.yaml b/jjb/verify/voltha-simonu-adapter.yaml
deleted file mode 100644
index 29aa572..0000000
--- a/jjb/verify/voltha-simonu-adapter.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-# verification jobs for 'voltha-simonu-adapter' repo
-
-- project:
-    name: voltha-simonu-adapter
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-simonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-      - 'publish-voltha-simonu-adapter-jobs':
-          branch-regexp: '{all-branches-regexp}'
-
-- job-group:
-    name: 'verify-voltha-simonu-adapter-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'tag-collision-reject':
-          dependency-jobs: 'verify_voltha-simonu-adapter_licensed'
-      - 'make-unit-test':
-          dest-gopath: "github.com/opencord"
-          unit-test-keep-going: 'true'
-
-- job-group:
-    name: 'publish-voltha-simonu-adapter-jobs'
-    jobs:
-      - 'docker-publish':
-          docker-repo: 'voltha'
-          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha.yaml b/jjb/verify/voltha.yaml
deleted file mode 100644
index 6eede8d..0000000
--- a/jjb/verify/voltha.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# verification jobs for 'xos' repo
-
-- project:
-    name: voltha
-    project: '{name}'
-
-    jobs:
-      - 'verify-voltha-jobs':
-          branch-regexp: '^(master|voltha-.*)$'
-
-- job-group:
-    name: 'verify-voltha-jobs'
-    jobs:
-      - 'verify-licensed'
-      - 'voltha-unit-test':
-          dependency-jobs: 'verify_voltha_licensed'
-
diff --git a/jjb/voltha-test/voltha-certification.yaml b/jjb/voltha-test/voltha-certification.yaml
index 228833f..75acaa6 100644
--- a/jjb/voltha-test/voltha-certification.yaml
+++ b/jjb/voltha-test/voltha-certification.yaml
@@ -129,6 +129,62 @@
           power-switch: True
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
 
+      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          reinstall-olt: false
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '13'
+          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-1600g'
+          disable-job: false
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: True
+          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+
+      # Certification (Radisys) pod with olt/onu - 2.8 version timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-1600x'
+          disable-job: false
+          reinstall-olt: false
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          profile: '1T8GEM'
+          time: '17'
+          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+
+      # Certification (Radisys) POD test job - master versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'menlo-certification-pod'
+          config-pod: 'menlo-certification-pod-radisys-1600x'
+          disable-job: false
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: True
+          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+
       # Certification (Radisys) pod with olt/onu - master versions timer based job , two OLTs
       - 'build_voltha_pod_release_timer':
             build-node: 'menlo-certification-pod'
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index f9f8d58..b3f7b19 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -391,7 +391,7 @@
           profile: '1T8GEM'
           num-of-onos: '3'
           num-of-atomix: '3'
-          time: '18'
+          time: '16'
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -441,7 +441,7 @@
           profile: '1T8GEM'
           num-of-onos: '3'
           num-of-atomix: '3'
-          time: '13'
+          time: '11'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
 
       # Berlin POD test job - master versions: uses 1T8GEM tech profile on voltha branch
@@ -469,7 +469,7 @@
           num-of-onos: '3'
           num-of-atomix: '3'
           pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
-          time: '6'
+          time: '5'
 
       # Berlin POD test job - master versions: uses tech profile on voltha branch
       - 'build_voltha_pod_test':
@@ -483,3 +483,35 @@
           profile: '1T8GEM'
           power-switch: True
           pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+
+      # Berlin pod with adtran gpon olt/onu - 2.8 1T8GEM tech profile and timer based job
+      - 'build_voltha_pod_release_timer':
+          build-node: 'dt-berlin-community-pod'
+          config-pod: 'dt-berlin-pod-gpon-adtran'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          release: '2.8'
+          branch: 'voltha-2.8'
+          profile: '1T8GEM'
+          reinstall-olt: false
+          num-of-onos: '3'
+          num-of-atomix: '3'
+          pipeline-script: 'voltha/voltha-2.8/physical-build.groovy'
+          VolthaEtcdPort: 9999
+          openoltAdapterChart: '/home/community/adtran-21.4-voltha-2.8/voltha-adapter-adtran-olt'
+          time: '21'
+
+      # Berlin POD adtran test job - 2.8 versions: uses 1T8GEM tech profile on voltha branch
+      - 'build_voltha_pod_test':
+          build-node: 'dt-berlin-community-pod'
+          config-pod: 'dt-berlin-pod-gpon-adtran'
+          release: '2.8'
+          branch: 'voltha-2.8'
+          name-extension: '_DT'
+          work-flow: 'DT'
+          test-repo: 'voltha-system-tests'
+          profile: '1T8GEM'
+          power-switch: True
+          pipeline-script: 'voltha/voltha-2.8/voltha-dt-physical-functional-tests.groovy'
+          oltAdapterAppLabel: 'adapter-adtran-olt'
+