diff --git a/.env b/.env
index 3e9d73b13e42e3612b70d552cb72e680e3d4a101..0828c47a21ba75c84f6fd11578552d754fb6f4a9 100644
--- a/.env
+++ b/.env
@@ -16,16 +16,16 @@ export ONOS_ROOT                        := $(shell pwd)/source-code
 export KARAF_VERSION                    := 4.2.14
 export IMAGE_NAME                       ?= muriloavlis/oran-onos
 export ONOS_BASE_IMAGENAME              := muriloavlis/oran-onos:base
-export IMAGE_VERSION                    := latest
+export IMAGE_VERSION                    := v3.0.0-dev
 
 # MAVEN 
-export DOCKER_MVN_IMAGE                 := maven:3.8.6-openjdk-11-slim
+export DOCKER_MVN_IMAGE                 := maven:3.6.3-openjdk-11-slim
 
 # APPS
 ## aaa
 export AAA_ROOT                         := $(shell pwd)/aaa
 export AAA_REPO                         := https://github.com/opencord/aaa.git
-export AAA_VERSION                      ?= 2.9.0
+export AAA_VERSION                      ?= 2.11.0
 export AAA_GROUPID                      := org.opencord
 export AAA_ARTIFACTID                   := aaa-app
 export AAA_ARTIFACT                     := ${AAA_GROUPID}:${AAA_ARTIFACTID}
@@ -34,7 +34,7 @@ export AAA_OAR                          := ${AAA_ROOT}/app/target/${AAA_ARTIFACT
 ### bgn     
 export BNG_ROOT                         := $(shell pwd)/bng
 export BNG_REPO                         := https://github.com/opencord/bng.git
-export BNG_VERSION                      ?= 2.5.0
+export BNG_VERSION                      ?= 2.5.1
 export BNG_GROUPID                      := org.opencord
 export BNG_ARTIFACTID                   := bng-app
 export BNG_ARTIFACT                     := ${BNG_GROUPID}:${BNG_ARTIFACTID}
@@ -43,7 +43,7 @@ export BNG_OAR                          := ${BNG_ROOT}/app/target/${BNG_ARTIFACT
 ### dhcpl2relay     
 export DHCPL2RELAY_ROOT                 := $(shell pwd)/dhcpl2relay
 export DHCPL2RELAY_REPO                 := https://github.com/opencord/dhcpl2relay.git
-export DHCPL2RELAY_VERSION              ?= 2.9.0
+export DHCPL2RELAY_VERSION              ?= 2.11.0
 export DHCPL2RELAY_GROUPID              := org.opencord
 export DHCPL2RELAY_ARTIFACTID           := dhcpl2relay-app
 export DHCPL2RELAY_ARTIFACT             := ${DHCPL2RELAY_GROUPID}:${DHCPL2RELAY_ARTIFACTID}
@@ -62,7 +62,7 @@ export FABRIC_TNA_OAR                   :=${FABRIC_TNA_ROOT}/target/${FABRIC_TNA
 ## igmpproxy       
 export IMGPPROXY_ROOT                   := $(shell pwd)/igmpproxy
 export IMGPPROXY_REPO                   := https://github.com/opencord/igmpproxy.git
-export IMGPPROXY_VERSION                ?= 2.7.0
+export IMGPPROXY_VERSION                ?= 2.9.0
 export IMGPPROXY_GROUPID                := org.opencord
 export IMGPPROXY_ARTIFACTID             := onos-app-igmpproxy-app
 export IMGPPROXY_ARTIFACT               := ${IMGPPROXY_GROUPID}:${IMGPPROXY_ARTIFACTID}
@@ -71,7 +71,7 @@ export IMGPPROXY_OAR                    := ${IMGPPROXY_ROOT}/app/target/${IMGPPR
 ## kafka        
 export KAFKA_ROOT                       := $(shell pwd)/kafka-onos
 export KAFKA_REPO                       := https://github.com/opencord/kafka-onos.git
-export KAFKA_VERSION                    ?= 2.11.1
+export KAFKA_VERSION                    ?= 2.13.0
 export KAFKA_GROUPID                    := org.opencord
 export KAFKA_ARTIFACTID                 := kafka
 export KAFKA_ARTIFACT                   := ${KAFKA_GROUPID}:${KAFKA_ARTIFACTID}
@@ -80,7 +80,7 @@ export KAFKA_OAR                        := ${KAFKA_ROOT}/app/target/${KAFKA_ARTI
 ## mac-learning     
 export MAC_LEARNING_ROOT                := $(shell pwd)/mac-learning
 export MAC_LEARNING_REPO                := https://github.com/opencord/mac-learning.git
-export MAC_LEARNING_VERSION             ?= 1.2.1
+export MAC_LEARNING_VERSION             ?= 1.2.3
 export MAC_LEARNING_GROUPID             := org.opencord
 export MAC_LEARNING_ARTIFACTID          := maclearner-app
 export MAC_LEARNING_ARTIFACT            := ${MAC_LEARNING_GROUPID}:${MAC_LEARNING_ARTIFACTID}
@@ -89,7 +89,7 @@ export MAC_LEARNING_OAR                 := ${MAC_LEARNING_ROOT}/app/target/${MAC
 ## mcast        
 export MCAST_ROOT                       := $(shell pwd)/mcast
 export MCAST_REPO                       := https://github.com/opencord/mcast.git
-export MCAST_VERSION                    ?= 2.8.0
+export MCAST_VERSION                    ?= 2.9.1
 export MCAST_GROUPID                    := org.opencord
 export MCAST_ARTIFACTID                 := mcast-app
 export MCAST_ARTIFACT                   := ${MCAST_GROUPID}:${MCAST_ARTIFACTID}
@@ -98,7 +98,7 @@ export MCAST_OAR                        := ${MCAST_ROOT}/app/target/${MCAST_ARTI
 ## olt      
 export OLT_ROOT                         := $(shell pwd)/olt
 export OLT_REPO                         := https://github.com/opencord/olt.git
-export OLT_VERSION                      ?= 5.2.3
+export OLT_VERSION                      ?= 5.2.6
 export OLT_GROUPID                      := org.opencord
 export OLT_ARTIFACTID                   := olt-app
 export OLT_ARTIFACT                     := ${OLT_GROUPID}:${OLT_ARTIFACTID}
@@ -106,30 +106,46 @@ export OLT_ARTIFACT                     := ${OLT_GROUPID}:${OLT_ARTIFACTID}
 ## olttopology      
 export OLTTOPOLOGY_ROOT                 := $(shell pwd)/olttopology
 export OLTTOPOLOGY_REPO                 := https://github.com/opencord/olttopology.git
-export OLTTOPOLOGY_VERSION              ?= 1.3.0
+export OLTTOPOLOGY_VERSION              ?= 1.3.1
 export OLTTOPOLOGY_GROUPID              := org.opencord
 export OLTTOPOLOGY_ARTIFACTID           := olttopology-app
 export OLTTOPOLOGY_ARTIFACT             := ${OLTTOPOLOGY_GROUPID}:${OLTTOPOLOGY_ARTIFACTID}
 export OLTTOPOLOGY_OAR                  := ${OLTTOPOLOGY_ROOT}/app/target/${OLTTOPOLOGY_ARTIFACTID}-${OLTTOPOLOGY_VERSION}.oar
 
 ## pppoagent     
-export PPPOEAGENT_ROOT                   := $(shell pwd)/pppoeagent
-export PPPOEAGENT_REPO                   := https://github.com/opencord/pppoeagent.git
-export PPPOEAGENT_VERSION                ?= 1.2.3
-export PPPOEAGENT_GROUPID                := org.opencord
-export PPPOEAGENT_ARTIFACTID             := pppoeagent-app
-export PPPOEAGENT_ARTIFACT               := ${PPPOEAGENT_GROUPID}:${PPPOEAGENT_ARTIFACTID}
-export PPPOEAGENT_OAR                    := ${PPPOEAGENT_ROOT}/app/target/${PPPOEAGENT_ARTIFACTID}-${PPPOEAGENT_VERSION}.oar
+export PPPOEAGENT_ROOT                  := $(shell pwd)/pppoeagent
+export PPPOEAGENT_REPO                  := https://github.com/opencord/pppoeagent.git
+export PPPOEAGENT_VERSION               ?= 1.3.0
+export PPPOEAGENT_GROUPID               := org.opencord
+export PPPOEAGENT_ARTIFACTID            := pppoeagent-app
+export PPPOEAGENT_ARTIFACT              := ${PPPOEAGENT_GROUPID}:${PPPOEAGENT_ARTIFACTID}
+export PPPOEAGENT_OAR                   := ${PPPOEAGENT_ROOT}/app/target/${PPPOEAGENT_ARTIFACTID}-${PPPOEAGENT_VERSION}.oar
 
 ## sadis        
 export SADIS_ROOT                       := $(shell pwd)/sadis
 export SADIS_REPO                       := https://github.com/opencord/sadis.git
-export SADIS_VERSION                    ?= 5.11.0
+export SADIS_VERSION                    ?= 5.12.2
 export SADIS_GROUPID                    := org.opencord
 export SADIS_ARTIFACTID                 := sadis-app
 export SADIS_ARTIFACT                   := ${SADIS_GROUPID}:${SADIS_ARTIFACTID}
 export SADIS_OAR                        := ${SADIS_ROOT}/app/target/${SADIS_ARTIFACTID}-${SADIS_VERSION}.oar
 
+## sonic driver
+export SONIC_DRIVER_ROOT                := $(shell pwd)/driver
+export SONIC_DRIVER_VERSION             ?= 0.1.0-SNAPSHOT
+export SONIC_DRIVER_GROUPID             := org.onosproject.drivers
+export SONIC_DRIVER_ARTIFACTID          := sonic
+export SONIC_DRIVER_ARTIFACT            := ${SONIC_DRIVER_GROUPID}:${SONIC_DRIVER_ARTIFACTID}
+export SONIC_DRIVER_OAR                 := ${SONIC_DRIVER_ROOT}/target/${SONIC_DRIVER_ARTIFACTID}-${SONIC_DRIVER_VERSION}.oar
+
+## sonic pipeline
+export SONIC_PIPELINER_ROOT             := $(shell pwd)/pipeliner
+export SONIC_PIPELINER_VERSION          ?= 0.1.0-SNAPSHOT
+export SONIC_PIPELINER_GROUPID          := org.onosproject.pipelines
+export SONIC_PIPELINER_ARTIFACTID       := sai
+export SONIC_PIPELINER_ARTIFACT         := ${SONIC_PIPELINER_GROUPID}:${SONIC_PIPELINER_ARTIFACTID}
+export SONIC_PIPELINER_OAR              := ${SONIC_PIPELINER_ROOT}/target/${SONIC_PIPELINER_ARTIFACTID}-${SONIC_PIPELINER_VERSION}.oar
+
 ## trellis-t3       
 export TRELLIS_T3_ROOT                  := $(shell pwd)/trellis-t3
 export TRELLIS_T3_REPO                  := https://gerrit.onosproject.org/trellis-t3
diff --git a/.gitignore b/.gitignore
index d4c38615feb59335ad27df180c1230b80be1b4cf..e2affc285951e9198463b279857b6213d2390ad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,19 @@
 .vscode
-.m2
\ No newline at end of file
+.m2
+driver
+./igmpproxy
+kafka-onos
+local-apps
+mac-learning
+mcast
+./olt
+./pipeliner
+trellis-control
+trellis-t3
+olttopology
+sadis
+aaa
+dhcpl2relay
+pppoeagent
+bng
+target
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 7cf6bf7a69f4cc77a8d601ab56f7bc108098f198..daeacf7d1bda731d5bd7ab46e256aaad4daa2f8f 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,8 @@ aaa: ## : Checkout aaa code
 	fi \
 	fi
 
+	@cd ${AAA_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 aaa-build: local-apps aaa  ## : Builds aaa using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -64,6 +66,9 @@ bng: ## : Checkout bng code
 	fi \
 	fi
 
+	@cd ${BNG_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+	@cd ${BNG_ROOT} && sed -i 's|<olt.api.version>5.2.4</olt.api.version>|<olt.api.version>5.2.5</olt.api.version>|g' pom.xml
+
 bng-build: local-apps bng  ## : Builds bng using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -85,7 +90,9 @@ dhcpl2relay: ## : Checkout dhcpl2relay code
 		echo "Unable to fetch the changes from the dhcpl2relay repository"; \
 	fi \
 	fi
-
+	
+	@cd ${DHCPL2RELAY_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+	
 dhcpl2relay-build: local-apps dhcpl2relay  ## : Builds dhcpl2relay using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -116,6 +123,15 @@ kafka-onos: ## : Checkout kafka-onos code
 	fi \
 	fi
 
+	@cd ${KAFKA_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<olt.api.version>5.2.4</olt.api.version>|<olt.api.version>5.2.5</olt.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<sadis.api.version>5.11.1</sadis.api.version>|<sadis.api.version>5.12.2</sadis.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<aaa.api.version>2.10.3</aaa.api.version>|<aaa.api.version>2.11.0</aaa.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<dhcpl2relay.api.version>2.10.0</dhcpl2relay.api.version>|<dhcpl2relay.api.version>2.11.0</dhcpl2relay.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<bng.api.version>2.5.0</bng.api.version>|<bng.api.version>2.5.1</bng.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<igmp.api.version>2.7.0</igmp.api.version>|<igmp.api.version>2.9.0</igmp.api.version>|g' pom.xml
+	@cd ${KAFKA_ROOT} && sed -i 's|<mcast.api.version>2.9.0</mcast.api.version>|<mcast.api.version>2.9.1</mcast.api.version>|g' pom.xml
+
 kafka-onos-build: local-apps kafka-onos  ## : Builds kafka-onos using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -138,6 +154,8 @@ mac-learning: ## : Checkout mac-learning code
 	fi \
 	fi
 
+	@cd ${MAC_LEARNING_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 mac-learning-build: local-apps mac-learning  ## : Builds mac-learning using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -160,6 +178,8 @@ mcast: ## : Checkout mcast code
 	fi \
 	fi
 
+	@cd ${MCAST_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 mcast-build: local-apps mcast  ## : Builds mcast using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -190,6 +210,8 @@ olttopology: ## : Checkout olttopology code
 	fi \
 	fi
 
+	@cd ${OLTTOPOLOGY_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 olttopology-build: local-apps olttopology  ## : Builds olt using local app or mvn
 	@./scripts/app-build.sh $@
 
@@ -213,10 +235,12 @@ pppoeagent: ## : Checkout pppoeagent code
 	fi \
 	fi
 
+	@cd ${PPPOEAGENT_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 pppoeagent-build: local-apps pppoeagent ## : Builds pppoeagent using local app or mvn
 	@./scripts/app-build.sh $@
 	
-sadis: ## : Checkout fabric-tna code
+sadis: ## : Checkout sadis code
 	@if [ ! -d "sadis" ]; then \
 		git clone ${SADIS_REPO}; \
 	fi
@@ -236,11 +260,23 @@ sadis: ## : Checkout fabric-tna code
 	fi \
 	fi
 
+	@cd ${SADIS_ROOT} && sed -i 's|<version>2.5.5</version>|<version>2.5.8-SNAPSHOT</version>|g' pom.xml
+
 sadis-build: local-apps sadis ## : Builds sadis using local app or mvn
 	@./scripts/app-build.sh $@
 
-fabric-tna: local-apps # Copy fabric-tna to the install directory (compilation was not possible due to missing bf-sde)
-	@cp -v "oar-files/${FABRIC_TNA_ARTIFACTID}-${FABRIC_TNA_VERSION}.oar" "${LOCAL_APPS}"
+sonic-onos-pipeliner: ## : Checkout olt code, utilizing the local directory located in the root/apps folder.
+	cp -r ${MODS_APPS}/sonic-onos-driver/pipeliner pipeliner;
+
+sonic-onos-pipeliner-build:  local-apps sonic-onos-pipeliner ## : Checkout olt code, utilizing the local directory located in the root/apps folder.
+	@./scripts/app-build.sh $@
+
+
+sonic-onos-driver: ## : Checkout olt code, utilizing the local directory located in the root/apps folder.
+	cp -r ${MODS_APPS}/sonic-onos-driver/driver driver;
+
+sonic-onos-driver-build:  local-apps sonic-onos-driver ## : Checkout olt code, utilizing the local directory located in the root/apps folder.
+	@./scripts/app-build.sh $@
 
 trellis-t3: ## : Checkout trellis-t3 code
 	@if [ ! -d "trellis-t3" ]; then \
@@ -286,13 +322,17 @@ trellis-control: ## : Checkout trellis-control code
 trellis-control-build: local-apps trellis-control  ## : Builds trellis-control using local app or mvn
 	@./scripts/app-build.sh $@
 
-up4: local-apps # Copy up4 to the install directory (TODO: verify compilation errors)
+up4: local-apps # Copy up4-app to the install directory (compilation was not possible due to errors)
 	@cp -v "oar-files/${UP4_ARTIFACTID}-${UP4_VERSION}.oar" "${LOCAL_APPS}"
 
+fabric-tna: local-apps # Copy fabric-tna to the install directory (compilation was not possible due to missing bf-sde)
+	@cp -v "oar-files/${FABRIC_TNA_ARTIFACTID}-${FABRIC_TNA_VERSION}.oar" "${LOCAL_APPS}"
+
 ## : Build the onos apps.
-apps-build: igmpproxy-build olt-build trellis-control-build up4 fabric-tna trellis-t3-build \
+apps-build: up4 fabric-tna sonic-onos-driver-build sonic-onos-pipeliner-build sadis-build \
+			igmpproxy-build olt-build trellis-control-build trellis-t3-build \
     		aaa-build bng-build dhcpl2relay-build kafka-onos-build mcast-build \
-			mac-learning-build olt-build olttopology-build sadis-build pppoeagent-build
+			mac-learning-build olttopology-build pppoeagent-build
 			@echo -e "${INFO_MSG}Apps compiled with success${END_MSG}"
 			
 # Clean all installation files
@@ -305,6 +345,8 @@ clean:
 	rm -rf ${LOCAL_APPS}
 	rm -rf ${PPPOEAGENT_ROOT}
 	rm -rf ${SADIS_ROOT}
+	rm -rf ${SONIC_DRIVER_ROOT}
+	rm -rf ${SONIC_PIPELINER_ROOT}
 	rm -rf ${AAA_ROOT}
 	rm -rf ${BNG_ROOT}
 	rm -rf ${DHCPL2RELAY_ROOT}
diff --git a/README.md b/README.md
index f881bc8220ffa48222025c60e9afbd4034e7cd41..a71a7f297cb74808de560fc9f6f08c85ee01c06b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 Custom docker image based on ONF's SDN ONOS Classic controller, developed for the OpenRAN@Brazil project.
 
+> **_Note_**: This repository contains the ORAN-ONOS image described in a paper written by Murilo Silva, Matheus Gomes, Victor Dias, Lucas B. Oliveira, Fernando Farias, Antônio Abelém entitled "Redes Definidas por Software para a Orquestração de Diferentes Domínios Tecnológicos" and published in XIV Workshop de Pesquisa Experimental da Internet do Futuro (WPEIF), DOI: https://doi.org/10.5753/wpeif.2023.753, May 2023. Please cite the paper if you plan to use it in your publication.
+
 ## Features
 
 - Based in ONOS Classic master (commit 25597);
@@ -15,18 +17,18 @@ Custom docker image based on ONF's SDN ONOS Classic controller, developed for th
 
 | App | Version |
 | ------ | ------ |
-|    aaa    |    2.9.0    |
-|    bng    |    2.5.0    |
-|    dhcpl2relay    |    2.9.0    |
+|    aaa    |    2.11.0    |
+|    bng    |    2.5.1    |
+|    dhcpl2relay    |    2.11.0    |
 | fabric-tna | 1.2.0.SNAPSHOT |
-| igmpproxy |     2.7.0     |
-| kafka |     2.11.1     |
-| mcast |    2.8.0     |
-| mac-learning | 1.2.1 |
-| olt | 5.2.3 |
-| olttopology | 1.3.0 |
-| pppoeagent | 1.2.3 |
-| sadis | 5.11.0 |
+| igmpproxy |     2.9.0     |
+| kafka |     2.13.0     |
+| mcast |    2.9.1     |
+| mac-learning | 1.2.3 |
+| olt | 5.2.6 |
+| olttopology | 1.3.1 |
+| pppoeagent | 1.3.0 |
+| sadis | 5.12.2 |
 | trellis-t3 | 4.1.0.SNAPSHOT |
 | trellis control/Segmentrouting | 3.3.0.SNAPSHOT |
 | up4 | 1.2.0.SNAPSHOT |
diff --git a/apps/igmpproxy/api/pom.xml b/apps/igmpproxy/api/pom.xml
index 7bf76f47340e1a6436134dad8956972ee657c0ec..82dc12cce4895af2388b1435fe8fb6acb05998b4 100644
--- a/apps/igmpproxy/api/pom.xml
+++ b/apps/igmpproxy/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-app-igmpproxy</artifactId>
         <groupId>org.opencord</groupId>
-        <version>2.7.0</version>
+        <version>2.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/apps/igmpproxy/api/target/checkstyle-cachefile b/apps/igmpproxy/api/target/checkstyle-cachefile
deleted file mode 100644
index 797020778f8513526c9c12bbe5fa23f69df26297..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/checkstyle-cachefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Dec 12 00:58:43 UTC 2023
-configuration*?=8C38B0D768A002DD18B7F7C2F6D8527923FD7CB4
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/package-info.java=1702341450005
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/package-info.java=1702341450001
diff --git a/apps/igmpproxy/api/target/checkstyle-checker.xml b/apps/igmpproxy/api/target/checkstyle-checker.xml
deleted file mode 100644
index fcad23f064e1e0c019272a994fedd8a4c6d8e751..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/checkstyle-checker.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-
-<!--
-   The default severity setting in checkstyle is 'error', so some
-   of the rules below are configured to change the severity to
-   'warning'.  Over time, these 'warning' settings should be
-   removed as more of the ONOS source code is modified to
-   follow the recommended rules.
--->
-
-
-<module name="Checker">
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        http://checkstyle.sourceforge.net/5.x/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-    <module name="JavadocPackage"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <module name="RegexpMultiline">
-        <property name="format" value="\r\n"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has windows line endings."/>
-    </module>
-
-    <!-- Don't allow usage of deprecated Throwables propagate methods -->
-    <module name="RegexpSingleline">
-        <property name="format" value="Throwables.propagate.*\("/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Throwables propagate methods have been deprecated."/>
-    </module>
-
-    <!-- Don't allow usage of Oracle JDK only javafx classes -->
-    <module name="RegexpSingleline">
-        <property name="format" value="javafx.*"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="javafx classes are not supported by all JDKs."/>
-    </module>
-
-    <!-- Don't allow usage of RuntimeException -->
-    <module name="RegexpSingleline">
-        <property name="format" value="throw[ ]*new[ ]*RuntimeException"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Don't throw generic exception types"/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="SuppressWithPlainTextCommentFilter"/>
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat"
-                      value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
-        </module>
-
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
-            <property name="checkFormat" value=".*"/>
-            <property name="influenceFormat" value="0"/>
-        </module>
-
-        <!-- Example: // CHECKSTYLE IGNORE FinalClass FOR NEXT 1 LINES  -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat"
-                      value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
-            <property name="checkFormat" value="$1"/>
-            <property name="influenceFormat" value="$2"/>
-        </module>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod">
-            <property name="scope" value="package"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="JavadocType">
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocVariable">
-            <!-- Suppress check for private member Javadocs.
-             Possibly revist fixing these. -->
-            <property name="scope" value="public"/>
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocStyle"/>
-        <!-- @author tag should not be used -->
-        <module name="WriteTag">
-            <property name="tag" value="@author"/>
-            <property name="tagFormat" value="\S"/>
-            <property name="severity" value="ignore"/>
-            <property name="tagSeverity" value="error"/>
-        </module>
-
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="2"/>
-        </module>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName">
-            <!--  ONOS allows the name "log" for static final Loggers -->
-            <property name="format"
-                      value="^log$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-
-        <module name="LocalVariableName"/>
-
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-        </module>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="allowStaticMemberImports" value="true"/>
-        </module>
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <!-- ONOS standard usage is 80 columns, but we allow up
-             to 120 to not break the build. -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^import"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-        </module>
-
-        <module name="ParameterNumber">
-            <property name="max" value="15"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-
-        <!-- Disabled for ONOS.  Default rules specify undesired behavior for the '?' operator -->
-        <!-- <module name="OperatorWrap"/> -->
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-        </module>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-
-        <!--  Disabled for ONOS to allow use of public          -->
-        <!--  modifiers in interfaces.                          -->
-        <!-- <module name="RedundantModifier"/>                 -->
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks">
-            <!-- ONOS alows declarations inside of switch case blocks -->
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        <module name="EmptyBlock">
-            <!-- allow empty block, as long as there's some comment -->
-            <property name="option" value="text"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- ONOS allows conditional operators -->
-        <!-- <module name="AvoidInlineConditionals"/> -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-
-        <module name="HiddenField">
-            <property name="ignoreSetter" value="true"/>
-            <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-
-        <!-- Many violations of this rule present, revist in a
-        subsequent round of cleanups -->
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- ONOS produces many warnings of this type.
-        Fixing all of these is outside the scope of the current cleanup. -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-
-        <module name="HideUtilityClassConstructor"/>
-
-        <module name="InterfaceIsType"/>
-
-        <module name="VisibilityModifier">
-            <property name="severity" value="ignore"/>
-        </module>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-
-        <!--  Many violations of this rule currently, too many to fix
-        in the current cleanup. -->
-        <!-- <module name="FinalParameters"/> -->
-        <!-- ONOS allows TODO markers in checked in source code -->
-        <!-- <module name="TodoComment"/> -->
-        <module name="UpperEll"/>
-    </module>
-
-</module>
diff --git a/apps/igmpproxy/api/target/checkstyle-header.txt b/apps/igmpproxy/api/target/checkstyle-header.txt
deleted file mode 100644
index 3de16d3a6c1c57389909ec2e8d794ab546d544ae..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/checkstyle-header.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Copyright 20[1-2][0-9].* Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 \(the "License"\);
diff --git a/apps/igmpproxy/api/target/checkstyle-result.xml b/apps/igmpproxy/api/target/checkstyle-result.xml
deleted file mode 100644
index 03a034e1de2be2a52821f85f29ec59e2ed6ebcdf..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/checkstyle-result.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle version="8.10">
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/GroupMemberIdSerializer.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/GroupMemberId.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineId.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachine.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/State.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineService.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticType.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpLeadershipService.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java">
-</file>
-<file name="/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatistics.java">
-</file>
-</checkstyle>
diff --git a/apps/igmpproxy/api/target/checkstyle-suppressions.xml b/apps/igmpproxy/api/target/checkstyle-suppressions.xml
deleted file mode 100644
index c972216a012fdaf705fda39a9a37f7f27126477a..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <suppress files="org.apache.karaf.branding.*" checks="[a-zA-Z0-9]*"/>
-
-    <suppress files=".*" checks="FinalParametersCheck"/>
-    <suppress files=".*" checks="MagicNumbersCheck"/>
-    <suppress files=".*" checks="DesignForExtensionCheck"/>
-    <suppress files=".*" checks="TodoCommentCheck"/>
-    <suppress files=".*" checks="AvoidInlineConditionalsCheck"/>
-    <suppress files=".*" checks="OperatorWrapCheck"/>
-    <suppress files=".*" checks="HiddenField"/>
-    <suppress files=".java" checks="NewlineAtEndOfFile"/>
-    <suppress files="org.onlab.packet.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onlab.jdvue.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.ofdpa.Ofdpa2GroupHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.segmentrouting.DefaultRoutingHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.mcast.McastHandler" checks="FileLength" />
-    <suppress files="org.onosproject.dhcprelay.Dhcp4HandlerImpl" checks="FileLength" />
-
-    <!-- These files carry AT&T copyrights -->
-    <suppress files="org.onlab.packet.EAP" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.EAPOL" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUS" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUSAttribute" checks="RegexpHeader" />
-
-    <!-- Suppressions for unit testing code -->
-    <suppress checks="Javadoc(Package|Method)"
-              files=".*/src/test/.*.java"
-            />
-
-    <suppress checks="Javadoc.*"
-              files=".*/thirdparty/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/kafkaintegration/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/demo/.*.java"/>
-
-    <suppress checks="FileLength"
-              files=".*/SegmentRoutingManager.java"/>
-    <suppress checks="FileLength"
-              files=".*/Ofdpa2GroupHandler.java"/>
-
-    <!-- Suppressions for yangutils generated code -->
-    <suppress files="org.onosproject.yang.gen.v1.*" checks="Javadoc.*" />
-
-    <suppress files="ApiDocRegistrator.java" checks="JavadocPackage" />
-</suppressions>
diff --git a/apps/igmpproxy/api/target/classes/META-INF/MANIFEST.MF b/apps/igmpproxy/api/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 026a32362dae9e7ea2437c1f6ee54fb2684c47ff..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1702342723337
-Build-Jdk: 11.0.16
-Built-By: root
-Bundle-Description: IGMPProxy application API
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-ManifestVersion: 2
-Bundle-Name: onos-app-igmpproxy-api
-Bundle-SymbolicName: org.opencord.onos-app-igmpproxy-api
-Bundle-Version: 2.7.0
-Created-By: Apache Maven Bundle Plugin
-Export-Package: org.opencord.igmpproxy;uses:="com.esotericsoftware.kryo,
- com.esotericsoftware.kryo.io,org.onlab.packet,org.onosproject.cluster,o
- rg.onosproject.event,org.onosproject.net";version="2.7.0",org.opencord.
- igmpproxy.statemachine;uses:="com.esotericsoftware.kryo,com.esotericsof
- tware.kryo.io,org.onlab.packet,org.onosproject.net";version="2.7.0"
-Import-Package: com.esotericsoftware.kryo;version="[4.0,5)",com.esoteric
- software.kryo.io;version="[4.0,5)",com.google.common.base;version="[22.
- 0,23)",org.onlab.packet;version="[2.5,3)",org.onosproject.cluster;versi
- on="[2.5,3)",org.onosproject.event;version="[2.5,3)",org.onosproject.ne
- t;version="[2.5,3)"
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
-Tool: Bnd-4.1.0.201810181252
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberId.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberId.class
index 90399ecaae90e7abdbdaa42d612b726f36c55990..26327b279793fb149fbf83cd1d423b3a35271866 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberId.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberId.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberIdSerializer.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberIdSerializer.class
index 0360a6318841f23931427c90d5450b7792e769d0..11d0ddca67025172700f0600155e89a08cb34caf 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberIdSerializer.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/GroupMemberIdSerializer.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpLeadershipService.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpLeadershipService.class
index 3fe764e47d84530095491e7cf9d2f17ed554d6d9..fe1df7a301fb1a0676b2fedc06d43856c93e886e 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpLeadershipService.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpLeadershipService.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticType.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticType.class
index 8de803cbb42b42a6ee22c8f2b71ad71322ad661c..953d8e02b1acd6baf5b85545b1515621c8387f4a 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticType.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticType.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics$1.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics$1.class
deleted file mode 100644
index 5c4f2d5ad3770416ab0c3b7178c298125ff4823e..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics$1.class and /dev/null differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics.class
index ad35bb32efdade266762d705a9737f6f916f7b59..d1582131630e9f35831fa74124c12b3086404291 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatistics.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent$Type.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent$Type.class
index d107da493636055ead0dbf8fa3ed36783b3c790b..7439fc65c1ea3be80a8eb582ea593eeee2466704 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent$Type.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent$Type.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent.class
index 5430262b32a12320516923cb41f848f4f7a7d7ef..2b28a4f701a41affc269a54afc85a52b52f136a8 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEvent.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEventListener.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEventListener.class
index de495bcf5b35ea80042221557afeb975ab024b5f..708bf4a302211a52b7e91a020126ac1e78fd2f21 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEventListener.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsEventListener.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsService.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsService.class
index f336ff0db8021c7d0d26abd0c0b2f3f3580cbcb7..d75fe577c5b2387b53ea2138a5c3877ed5856b47 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsService.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/IgmpStatisticsService.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/State.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/State.class
index d54c5ee57b6728ff330eebc806662675eb27f842..e6cdcdaf39a871e5f6fc2396e69ffcf6f3ae8977 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/State.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/State.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachine.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachine.class
index 174e3c2f16e2585ecd6fb29b979a1c38ac988a7c..0305b89e2f3e18651c952f7457a13d87a28bff12 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachine.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachine.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineId.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineId.class
index f28ec16f1d958d4cbc789255b2b24870ee8446cd..018cfefd462e1bf8ab8071efcc47849709a75dbb 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineId.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineId.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.class
index 575893865ca7d0ba077308ec15b7a1538497f12d..4a1c2fb4bf5a96ce45e6b9fe9d4774f72637f908 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.class differ
diff --git a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineService.class b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineService.class
index e6632e191ed20cf6359db968d0dcd16734bd6800..32d8b0f5d13f3f0841bc19409d66f495557edf7b 100644
Binary files a/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineService.class and b/apps/igmpproxy/api/target/classes/org/opencord/igmpproxy/statemachine/StateMachineService.class differ
diff --git a/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 2873d9057e791e86db9c4c991774439952c2eb19..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-org/opencord/igmpproxy/statemachine/StateMachineId.class
-org/opencord/igmpproxy/IgmpStatisticsEventListener.class
-org/opencord/igmpproxy/statemachine/StateMachine.class
-org/opencord/igmpproxy/IgmpStatistics.class
-org/opencord/igmpproxy/GroupMemberId.class
-org/opencord/igmpproxy/IgmpStatistics$1.class
-org/opencord/igmpproxy/IgmpStatisticsEvent.class
-org/opencord/igmpproxy/statemachine/StateMachineService.class
-org/opencord/igmpproxy/IgmpStatisticType.class
-org/opencord/igmpproxy/statemachine/State.class
-org/opencord/igmpproxy/IgmpStatisticsEvent$Type.class
-org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.class
-org/opencord/igmpproxy/IgmpStatisticsService.class
-org/opencord/igmpproxy/IgmpLeadershipService.class
-org/opencord/igmpproxy/GroupMemberIdSerializer.class
diff --git a/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 84411a0abe76f70d22b5407f174436c247cfd221..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineId.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsService.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineService.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachine.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpLeadershipService.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/GroupMemberId.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEvent.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/State.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatistics.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/package-info.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/GroupMemberIdSerializer.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticType.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/IgmpStatisticsEventListener.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/package-info.java
-/usr/src/igmpproxy/api/src/main/java/org/opencord/igmpproxy/statemachine/StateMachineIdSerializer.java
diff --git a/apps/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar b/apps/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar
deleted file mode 100644
index 3cbea64d7829a423e6455aa38a897719d0091a64..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/pom.xml b/apps/igmpproxy/app/pom.xml
index bd90c3e3e6c2bd4b5de2aadec7b7fcb9220595df..161b607314d96f726be29921d5637a8c66e64164 100644
--- a/apps/igmpproxy/app/pom.xml
+++ b/apps/igmpproxy/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-app-igmpproxy</artifactId>
         <groupId>org.opencord</groupId>
-        <version>2.7.0</version>
+        <version>2.9.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,7 @@
         <onos.app.title>IGMP proxy app</onos.app.title>
         <onos.app.url>http://opencord.org</onos.app.url>
         <onos.app.readme>IGMP implementation.</onos.app.readme>
-        <sadis.api.version>5.10.0</sadis.api.version>
+        <sadis.api.version>5.12.2</sadis.api.version>
     </properties>
 
     <dependencies>
diff --git a/apps/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java b/apps/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
index fea1fbfc1f2ff764ef0788aa6ef475925bfaa63b..a3876d1b1782553631fb336e3f8517b438a079d6 100644
--- a/apps/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
+++ b/apps/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
@@ -105,7 +105,8 @@ import static org.onlab.packet.IGMPMembership.MODE_IS_INCLUDE;
 import static org.onlab.util.Tools.groupedThreads;
 
 /**
- * Igmp process application, use proxy mode, support first join/ last leave , fast leave
+ * Igmp process application, use proxy mode, support first join/ last leave ,
+ * fast leave
  * period query and keep alive, packet out igmp message to uplink port features.
  */
 @Component(immediate = true)
@@ -114,18 +115,15 @@ public class IgmpManager {
     private static final String SADIS_NOT_RUNNING = "Sadis is not running.";
     private static final String APP_NAME = "org.opencord.igmpproxy";
 
-    private static final Class<IgmpproxyConfig> IGMPPROXY_CONFIG_CLASS =
-            IgmpproxyConfig.class;
-    private static final Class<IgmpproxySsmTranslateConfig> IGMPPROXY_SSM_CONFIG_CLASS =
-            IgmpproxySsmTranslateConfig.class;
-    private static final Class<McastConfig> MCAST_CONFIG_CLASS =
-            McastConfig.class;
+    private static final Class<IgmpproxyConfig> IGMPPROXY_CONFIG_CLASS = IgmpproxyConfig.class;
+    private static final Class<IgmpproxySsmTranslateConfig> IGMPPROXY_SSM_CONFIG_CLASS = IgmpproxySsmTranslateConfig.class;
+    private static final Class<McastConfig> MCAST_CONFIG_CLASS = McastConfig.class;
 
     private static ApplicationId appId;
 
     private static int unSolicitedTimeout = 3; // unit is 1 sec
     private static int keepAliveCount = 3;
-    private static int lastQueryInterval = 2;  //unit is 1 sec
+    private static int lastQueryInterval = 2; // unit is 1 sec
     private static int lastQueryCount = 2;
     private static boolean fastLeave = true;
     private static boolean withRAUplink = true;
@@ -136,7 +134,7 @@ public class IgmpManager {
     private static byte igmpCos = 7;
     private static byte igmpUniCos = 7;
     public static boolean connectPointMode = true;
-    //This is the uplink connect point
+    // This is the uplink connect point
     public static ConnectPoint connectPoint = null;
     private static ConnectPoint sourceDeviceAndPort = null;
     private static boolean enableIgmpProvisioning = false;
@@ -152,8 +150,7 @@ public class IgmpManager {
 
     private static boolean pimSSmInterworking = false;
     private static final String DEFAULT_PIMSSM_HOST = "127.0.0.1";
-    private final ScheduledExecutorService scheduledExecutorService =
-            Executors.newScheduledThreadPool(1);
+    private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected CoreService coreService;
@@ -176,16 +173,10 @@ public class IgmpManager {
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected NetworkConfigRegistry networkConfig;
 
-    @Reference(cardinality = ReferenceCardinality.OPTIONAL,
-            bind = "bindMcastRouteService",
-            unbind = "unbindMcastRouteService",
-            policy = ReferencePolicy.DYNAMIC)
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL, bind = "bindMcastRouteService", unbind = "unbindMcastRouteService", policy = ReferencePolicy.DYNAMIC)
     protected volatile MulticastRouteService multicastService;
 
-    @Reference(cardinality = ReferenceCardinality.OPTIONAL,
-            bind = "bindSadisService",
-            unbind = "unbindSadisService",
-            policy = ReferencePolicy.DYNAMIC)
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL, bind = "bindSadisService", unbind = "unbindSadisService", policy = ReferencePolicy.DYNAMIC)
     protected volatile SadisService sadisService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -205,29 +196,26 @@ public class IgmpManager {
     private ApplicationId coreAppId;
     private Map<Ip4Address, Ip4Address> ssmTranslateTable = new ConcurrentHashMap<>();
 
-    private InternalNetworkConfigListener configListener =
-            new InternalNetworkConfigListener();
+    private InternalNetworkConfigListener configListener = new InternalNetworkConfigListener();
     private DeviceListener deviceListener = new InternalDeviceListener();
 
-    private ConfigFactory<ApplicationId, IgmpproxyConfig> igmpproxyConfigFactory =
-            new ConfigFactory<ApplicationId, IgmpproxyConfig>(
-                    SubjectFactories.APP_SUBJECT_FACTORY, IGMPPROXY_CONFIG_CLASS, "igmpproxy") {
-                @Override
-                public IgmpproxyConfig createConfig() {
-                    return new IgmpproxyConfig();
-                }
-            };
-    private ConfigFactory<ApplicationId, IgmpproxySsmTranslateConfig> igmpproxySsmConfigFactory =
-            new ConfigFactory<ApplicationId, IgmpproxySsmTranslateConfig>(
-                    SubjectFactories.APP_SUBJECT_FACTORY, IGMPPROXY_SSM_CONFIG_CLASS, "ssmTranslate", true) {
-                @Override
-                public IgmpproxySsmTranslateConfig createConfig() {
-                    return new IgmpproxySsmTranslateConfig();
-                }
-            };
+    private ConfigFactory<ApplicationId, IgmpproxyConfig> igmpproxyConfigFactory = new ConfigFactory<ApplicationId, IgmpproxyConfig>(
+            SubjectFactories.APP_SUBJECT_FACTORY, IGMPPROXY_CONFIG_CLASS, "igmpproxy") {
+        @Override
+        public IgmpproxyConfig createConfig() {
+            return new IgmpproxyConfig();
+        }
+    };
+    private ConfigFactory<ApplicationId, IgmpproxySsmTranslateConfig> igmpproxySsmConfigFactory = new ConfigFactory<ApplicationId, IgmpproxySsmTranslateConfig>(
+            SubjectFactories.APP_SUBJECT_FACTORY, IGMPPROXY_SSM_CONFIG_CLASS, "ssmTranslate", true) {
+        @Override
+        public IgmpproxySsmTranslateConfig createConfig() {
+            return new IgmpproxySsmTranslateConfig();
+        }
+    };
 
-    private int maxResp = 10; //unit is 1 sec
-    private int keepAliveInterval = 120; //unit is 1 sec
+    private int maxResp = 10; // unit is 1 sec
+    private int keepAliveInterval = 120; // unit is 1 sec
 
     private int numberOfIgmpReportProcessorThreads = 20;
     ExecutorService[] igmpReportProcessServiceExecutorList;
@@ -298,11 +286,10 @@ public class IgmpManager {
     private void initializeIgmpReportProcessServiceExecutors() {
         igmpReportProcessServiceExecutorList = new ExecutorService[numberOfIgmpReportProcessorThreads];
         for (int i = 0; i < numberOfIgmpReportProcessorThreads; i++) {
-            ThreadFactory igmpReportProcessorThreadFactory =
-                    new ThreadFactoryBuilder().setNameFormat("report-processor-igmp-" + i)
-                            .setUncaughtExceptionHandler((t, e) ->
-                                    log.error("Uncaught exception on {}: ", t.getName(), e))
-                            .build();
+            ThreadFactory igmpReportProcessorThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("report-processor-igmp-" + i)
+                    .setUncaughtExceptionHandler((t, e) -> log.error("Uncaught exception on {}: ", t.getName(), e))
+                    .build();
             ExecutorService igmpReportProcessServiceExecutor = Executors.newSingleThreadExecutor(
                     igmpReportProcessorThreadFactory);
             igmpReportProcessServiceExecutorList[i] = igmpReportProcessServiceExecutor;
@@ -364,7 +351,7 @@ public class IgmpManager {
 
         Ip4Address gAddr = igmpQuery.getGaddr().getIp4Address();
         final int maxResponseTime = calculateMaxResp(maxResp);
-        //The query is received on the ConnectPoint
+        // The query is received on the ConnectPoint
         // send query accordingly to the registered OLT devices.
         if (gAddr != null && !gAddr.isZero()) {
             deviceService.getAvailableDevices().forEach(device -> {
@@ -376,14 +363,13 @@ public class IgmpManager {
             });
             igmpStatisticsManager.increaseStat(IgmpStatisticType.CURRENT_GRP_NUMBER_COUNTER);
         } else {
-            //Don't know which group is targeted by the query
-            //So query all the members(in all the OLTs) and proxy their reports
+            // Don't know which group is targeted by the query
+            // So query all the members(in all the OLTs) and proxy their reports
             stateMachineService.generalQuery(maxResponseTime);
             igmpStatisticsManager.increaseStat(IgmpStatisticType.IGMP_GENERAL_MEMBERSHIP_QUERY);
         }
     }
 
-
     private int calculateMaxResp(int maxResp) {
         if (maxResp >= 128) {
             int mant = maxResp & 0xf;
@@ -515,11 +501,11 @@ public class IgmpManager {
                 groupMember.updateList(recordType, sourceList);
                 groupMember.getSourceList().forEach(source -> {
                     McastRoute route = new McastRoute(source, groupIp, McastRoute.Type.IGMP);
-                    //add route
+                    // add route
                     multicastService.add(route);
-                    //add source to the route
+                    // add source to the route
                     multicastService.addSources(route, Sets.newHashSet(sourceConnectPoints));
-                    //add sink to the route
+                    // add sink to the route
                     multicastService.addSinks(route, Sets.newHashSet(cp));
                 });
                 igmpStatisticsManager.increaseStat(IgmpStatisticType.UNCONFIGURED_GROUP_COUNTER);
@@ -528,7 +514,7 @@ public class IgmpManager {
             groupMember.resetAllTimers();
             groupMember.updateList(recordType, sourceList);
             groupMember.setLeave(false);
-            //put updated member to the store
+            // put updated member to the store
             groupMemberStore.putGroupMember(groupMember);
         } else {
             log.debug("Received leave on {} for vlan {}", cp, vlan);
@@ -544,7 +530,7 @@ public class IgmpManager {
                     leaveAction(groupMember);
                 } else {
                     sendQuery(groupMember);
-                    //put modified group member object to the store
+                    // put modified group member object to the store
                     groupMemberStore.updateGroupMember(groupMember);
                 }
             }
@@ -561,7 +547,8 @@ public class IgmpManager {
         stateMachineService.leave(groupMember.getDeviceId(), groupMember.getGroupIp());
         groupMember.getSourceList().forEach(source -> multicastService.removeSinks(
                 new McastRoute(source, groupMember.getGroupIp(),
-                        McastRoute.Type.IGMP), Sets.newHashSet(cp)));
+                        McastRoute.Type.IGMP),
+                Sets.newHashSet(cp)));
         groupMemberStore.removeGroupMember(groupMember.getGroupMemberId());
     }
 
@@ -581,11 +568,11 @@ public class IgmpManager {
     }
 
     /**
-     * @return connect point of the source if configured; and empty Optional otherwise.
+     * @return connect point of the source if configured; and empty Optional
+     *         otherwise.
      */
     public static Optional<ConnectPoint> getSource() {
-        return sourceDeviceAndPort == null ? Optional.empty() :
-                Optional.of(sourceDeviceAndPort);
+        return sourceDeviceAndPort == null ? Optional.empty() : Optional.of(sourceDeviceAndPort);
     }
 
     /**
@@ -634,17 +621,17 @@ public class IgmpManager {
                     switch (igmp.getIgmpType()) {
                         case IGMP.TYPE_IGMPV3_MEMBERSHIP_QUERY:
                             igmpStatisticsManager.increaseStat(IgmpStatisticType.IGMP_V3_MEMBERSHIP_QUERY);
-                            //Discard Query from OLT’s non-uplink port’s
+                            // Discard Query from OLT’s non-uplink port’s
                             if (!pkt.receivedFrom().port().equals(upLinkPort)) {
                                 if (isConnectPoint(deviceId, pkt.receivedFrom().port())) {
                                     log.info("IGMP Picked up query from connectPoint");
-                                    //OK to process packet
+                                    // OK to process packet
                                     processIgmpConnectPointQuery((IGMPQuery) igmp.getGroups().get(0),
                                             pkt.receivedFrom(),
                                             0xff & igmp.getMaxRespField());
                                     break;
                                 } else {
-                                    //Not OK to process packet
+                                    // Not OK to process packet
                                     log.warn("IGMP Picked up query from non-uplink port {}", upLinkPort);
                                     return;
                                 }
@@ -685,7 +672,7 @@ public class IgmpManager {
     }
 
     private void processIgmpMessage(InboundPacket pkt, IGMP igmp, PortNumber upLinkPort, short vlan) {
-        //Discard join/leave from OLT’s uplink port’s
+        // Discard join/leave from OLT’s uplink port’s
         if (pkt.receivedFrom().port().equals(upLinkPort) ||
                 isConnectPoint(pkt.receivedFrom().deviceId(), pkt.receivedFrom().port())) {
             log.info("IGMP Picked up join/leave from uplink/connectPoint port");
@@ -701,9 +688,9 @@ public class IgmpManager {
                         pkt.receivedFrom(), igmp.getIgmpType());
             } else {
                 IGMPMembership mgroup = new IGMPMembership(group.getGaddr().getIp4Address());
-                mgroup.setRecordType(igmp.getIgmpType() == IGMP.TYPE_IGMPV2_MEMBERSHIP_REPORT ?
-                        IGMPMembership.MODE_IS_EXCLUDE :
-                        IGMPMembership.MODE_IS_INCLUDE);
+                mgroup.setRecordType(
+                        igmp.getIgmpType() == IGMP.TYPE_IGMPV2_MEMBERSHIP_REPORT ? IGMPMembership.MODE_IS_EXCLUDE
+                                : IGMPMembership.MODE_IS_INCLUDE);
                 queueIgmpReport(mgroup, VlanId.vlanId(vlan),
                         pkt.receivedFrom(), igmp.getIgmpType());
             }
@@ -743,13 +730,13 @@ public class IgmpManager {
         private void lastQuery(GroupMember groupMember) {
             if (groupMember.getLastQueryInterval() < lastQueryInterval) {
                 groupMember.lastQueryInterval(true); // count times
-                //put modified group member object to the store
+                // put modified group member object to the store
                 groupMemberStore.updateGroupMember(groupMember);
             } else if (groupMember.getLastQueryCount() < lastQueryCount - 1) {
                 sendQuery(groupMember);
                 groupMember.lastQueryInterval(false); // reset count number
-                groupMember.lastQueryCount(true); //count times
-                //put modified group member object to the store
+                groupMember.lastQueryCount(true); // count times
+                // put modified group member object to the store
                 groupMemberStore.updateGroupMember(groupMember);
             } else if (groupMember.getLastQueryCount() == lastQueryCount - 1) {
                 leaveAction(groupMember);
@@ -759,13 +746,13 @@ public class IgmpManager {
         private void periodicQuery(GroupMember groupMember) {
             if (groupMember.getKeepAliveQueryInterval() < keepAliveInterval) {
                 groupMember.keepAliveInterval(true);
-                //put modified group member object to the store
+                // put modified group member object to the store
                 groupMemberStore.updateGroupMember(groupMember);
             } else if (groupMember.getKeepAliveQueryCount() < keepAliveCount) {
                 sendQuery(groupMember);
                 groupMember.keepAliveInterval(false);
                 groupMember.keepAliveQueryCount(true);
-                //put modified group member object to the store
+                // put modified group member object to the store
                 groupMemberStore.updateGroupMember(groupMember);
             } else if (groupMember.getKeepAliveQueryCount() == keepAliveCount) {
                 leaveAction(groupMember);
@@ -778,8 +765,7 @@ public class IgmpManager {
         Device device = deviceService.getDevice(devId);
         if (device == null || device.serialNumber() == null) {
             return Optional.empty();
-        }
-        if (devId.toString().contains("device") || devId.toString().contains("netconf")) {
+        } else if (devId.toString().contains("device:") || devId.toString().contains("netconf:")) {
             return Optional.empty();
         }
         Optional<SubscriberAndDeviceInformation> olt = getSubscriberAndDeviceInformation(device.serialNumber());
@@ -787,8 +773,7 @@ public class IgmpManager {
             return Optional.empty();
         }
         PortNumber portNumber = PortNumber.portNumber(olt.get().uplinkPort());
-        return validateUpLinkPort(device.id(), portNumber) ?
-                Optional.of(portNumber) : Optional.empty();
+        return validateUpLinkPort(device.id(), portNumber) ? Optional.of(portNumber) : Optional.empty();
     }
 
     /**
@@ -799,7 +784,7 @@ public class IgmpManager {
     public boolean validateUpLinkPort(DeviceId deviceId, PortNumber portNumber) {
         Port port = deviceService.getPort(deviceId, portNumber);
         if (port == null) {
-            //port is not discovered by ONOS; so cannot validate it.
+            // port is not discovered by ONOS; so cannot validate it.
             return false;
         }
         boolean isValid = port.annotations().value(AnnotationKeys.PORT_NAME) != null &&
@@ -820,7 +805,7 @@ public class IgmpManager {
             log.debug("IGMP trap rules won't be installed since enableIgmpProvisioning flag is not set");
             return;
         }
-        //TODO migrate to packet requests when packet service uses filtering objectives
+        // TODO migrate to packet requests when packet service uses filtering objectives
         DefaultFilteringObjective.Builder builder = DefaultFilteringObjective.builder();
 
         builder = remove ? builder.deny() : builder.permit();
@@ -870,7 +855,8 @@ public class IgmpManager {
     }
 
     /**
-     * Fetches device information associated with the device serial number from SADIS.
+     * Fetches device information associated with the device serial number from
+     * SADIS.
      *
      * @param serialNumber serial number of a device
      * @return device information; an empty Optional otherwise.
@@ -885,7 +871,8 @@ public class IgmpManager {
             return Optional.ofNullable(sadisService.getSubscriberInfoService().get(serialNumber));
         } finally {
             if (log.isDebugEnabled()) {
-                // SADIS can call remote systems to fetch device data and this calls can take a long time.
+                // SADIS can call remote systems to fetch device data and this calls can take a
+                // long time.
                 // This measurement is just for monitoring these kinds of situations.
                 log.debug("Device fetched from SADIS. Elapsed {} msec", System.currentTimeMillis() - start);
             }
@@ -893,7 +880,8 @@ public class IgmpManager {
     }
 
     /**
-     * Fetches device information associated with the device serial number from SADIS.
+     * Fetches device information associated with the device serial number from
+     * SADIS.
      *
      * @param deviceId device id
      * @return device information; an empty Optional otherwise.
@@ -902,7 +890,7 @@ public class IgmpManager {
         Device device = deviceService.getDevice(deviceId);
         if (device == null || device.serialNumber() == null) {
             return Optional.empty();
-        } else if ((device.id().toString().contains("device")) || (device.id().toString().contains("netconf"))) {
+        } else if ((device.id().toString().contains("device:")) || (device.id().toString().contains("netconf:"))) {
             return Optional.empty();
         }
         return getSubscriberAndDeviceInformation(device.serialNumber());
@@ -984,12 +972,12 @@ public class IgmpManager {
     }
 
     private Set<McastRoute> multicastRoutesOfIgmpProxy() {
-        Set<McastRoute> routes = new HashSet<>(); //using set to eliminate multiple entities
+        Set<McastRoute> routes = new HashSet<>(); // using set to eliminate multiple entities
         groupMemberStore.getAllGroupMemberIds().forEach(groupMemberId -> {
             GroupMember groupMember = groupMemberStore.getGroupMember(groupMemberId);
             if (groupMember != null) {
                 groupMember.getSourceList().forEach(source -> {
-                    //regenerate the routes created by this application
+                    // regenerate the routes created by this application
                     routes.add(new McastRoute(source, groupMemberId.getGroupIp(), McastRoute.Type.IGMP));
                 });
             }
@@ -1005,21 +993,21 @@ public class IgmpManager {
         if (!(getSource().isPresent() &&
                 getSource().get().deviceId().equals(deviceId) &&
                 getSource().get().port().equals(portNumber))) {
-            //connect point is not configured as the source
+            // connect point is not configured as the source
             log.debug("{}/{} is not the source cp. Stopped processing it further", deviceId, portNumber);
             return;
         }
         log.info("source device:port is {}. DeviceId={}, portNumber={}",
-                (enabled ? "enabled. Restoring the source" :
-                        "disabled. Deleting it from multicast routes"), deviceId, portNumber);
+                (enabled ? "enabled. Restoring the source" : "disabled. Deleting it from multicast routes"), deviceId,
+                portNumber);
 
         Set<McastRoute> routes = multicastRoutesOfIgmpProxy();
         routes.forEach(route -> {
             if (enabled) {
-                //add source to the route
+                // add source to the route
                 multicastService.addSources(route, Sets.newHashSet(new ConnectPoint(deviceId, portNumber)));
             } else {
-                //remove the source from the route
+                // remove the source from the route
                 multicastService.removeSources(route, Sets.newHashSet(new ConnectPoint(deviceId, portNumber)));
             }
         });
@@ -1090,11 +1078,11 @@ public class IgmpManager {
                 log.debug("source parameter configured to {}", sourceDeviceAndPort);
             }
             if (oldSourceDevPort != null && !oldSourceDevPort.equals(sourceDeviceAndPort)) {
-                //source config has changed, remove the old source from multicast routes
+                // source config has changed, remove the old source from multicast routes
                 onSourceStateChanged(oldSourceDevPort.deviceId(), oldSourceDevPort.port(), false);
             }
             if (sourceDeviceAndPort != null && !sourceDeviceAndPort.equals(oldSourceDevPort)) {
-                //add new source to the existing routes
+                // add new source to the existing routes
                 onSourceStateChanged(sourceDeviceAndPort.deviceId(), sourceDeviceAndPort.port(), true);
             }
         }
@@ -1139,7 +1127,8 @@ public class IgmpManager {
 
                         if (vlanConfigChanged || innerVlanConfigChanged) {
                             log.info("igmpproxy vlan config received. {}", config);
-                            //at least one of the vlan configs has changed. Call leave before setting new values
+                            // at least one of the vlan configs has changed. Call leave before setting new
+                            // values
                             groupMemberStore.getAllGroupMembers().forEach(m -> {
                                 if (igmpLeadershipService.isLocalLeader(m.getDeviceId())) {
                                     leaveAction(m);
diff --git a/apps/igmpproxy/app/target/checkstyle-cachefile b/apps/igmpproxy/app/target/checkstyle-cachefile
deleted file mode 100644
index a55fd655efde68c86fb693a81f01443b2f02a34b..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/checkstyle-cachefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Dec 12 00:59:10 UTC 2023
-configuration*?=50265323116AAEEC42897DED0D09653A9D5402BE
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/package-info.java=1702341450005
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/package-info.java=1702341450005
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java=1702341450005
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/package-info.java=1702341450005
diff --git a/apps/igmpproxy/app/target/checkstyle-checker.xml b/apps/igmpproxy/app/target/checkstyle-checker.xml
deleted file mode 100644
index fcad23f064e1e0c019272a994fedd8a4c6d8e751..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/checkstyle-checker.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-
-<!--
-   The default severity setting in checkstyle is 'error', so some
-   of the rules below are configured to change the severity to
-   'warning'.  Over time, these 'warning' settings should be
-   removed as more of the ONOS source code is modified to
-   follow the recommended rules.
--->
-
-
-<module name="Checker">
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        http://checkstyle.sourceforge.net/5.x/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-    <module name="JavadocPackage"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <module name="RegexpMultiline">
-        <property name="format" value="\r\n"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has windows line endings."/>
-    </module>
-
-    <!-- Don't allow usage of deprecated Throwables propagate methods -->
-    <module name="RegexpSingleline">
-        <property name="format" value="Throwables.propagate.*\("/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Throwables propagate methods have been deprecated."/>
-    </module>
-
-    <!-- Don't allow usage of Oracle JDK only javafx classes -->
-    <module name="RegexpSingleline">
-        <property name="format" value="javafx.*"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="javafx classes are not supported by all JDKs."/>
-    </module>
-
-    <!-- Don't allow usage of RuntimeException -->
-    <module name="RegexpSingleline">
-        <property name="format" value="throw[ ]*new[ ]*RuntimeException"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Don't throw generic exception types"/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="SuppressWithPlainTextCommentFilter"/>
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat"
-                      value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
-        </module>
-
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
-            <property name="checkFormat" value=".*"/>
-            <property name="influenceFormat" value="0"/>
-        </module>
-
-        <!-- Example: // CHECKSTYLE IGNORE FinalClass FOR NEXT 1 LINES  -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat"
-                      value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
-            <property name="checkFormat" value="$1"/>
-            <property name="influenceFormat" value="$2"/>
-        </module>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod">
-            <property name="scope" value="package"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="JavadocType">
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocVariable">
-            <!-- Suppress check for private member Javadocs.
-             Possibly revist fixing these. -->
-            <property name="scope" value="public"/>
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocStyle"/>
-        <!-- @author tag should not be used -->
-        <module name="WriteTag">
-            <property name="tag" value="@author"/>
-            <property name="tagFormat" value="\S"/>
-            <property name="severity" value="ignore"/>
-            <property name="tagSeverity" value="error"/>
-        </module>
-
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="2"/>
-        </module>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName">
-            <!--  ONOS allows the name "log" for static final Loggers -->
-            <property name="format"
-                      value="^log$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-
-        <module name="LocalVariableName"/>
-
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-        </module>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="allowStaticMemberImports" value="true"/>
-        </module>
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <!-- ONOS standard usage is 80 columns, but we allow up
-             to 120 to not break the build. -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^import"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-        </module>
-
-        <module name="ParameterNumber">
-            <property name="max" value="15"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-
-        <!-- Disabled for ONOS.  Default rules specify undesired behavior for the '?' operator -->
-        <!-- <module name="OperatorWrap"/> -->
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-        </module>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-
-        <!--  Disabled for ONOS to allow use of public          -->
-        <!--  modifiers in interfaces.                          -->
-        <!-- <module name="RedundantModifier"/>                 -->
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks">
-            <!-- ONOS alows declarations inside of switch case blocks -->
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        <module name="EmptyBlock">
-            <!-- allow empty block, as long as there's some comment -->
-            <property name="option" value="text"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- ONOS allows conditional operators -->
-        <!-- <module name="AvoidInlineConditionals"/> -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-
-        <module name="HiddenField">
-            <property name="ignoreSetter" value="true"/>
-            <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-
-        <!-- Many violations of this rule present, revist in a
-        subsequent round of cleanups -->
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- ONOS produces many warnings of this type.
-        Fixing all of these is outside the scope of the current cleanup. -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-
-        <module name="HideUtilityClassConstructor"/>
-
-        <module name="InterfaceIsType"/>
-
-        <module name="VisibilityModifier">
-            <property name="severity" value="ignore"/>
-        </module>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-
-        <!--  Many violations of this rule currently, too many to fix
-        in the current cleanup. -->
-        <!-- <module name="FinalParameters"/> -->
-        <!-- ONOS allows TODO markers in checked in source code -->
-        <!-- <module name="TodoComment"/> -->
-        <module name="UpperEll"/>
-    </module>
-
-</module>
diff --git a/apps/igmpproxy/app/target/checkstyle-header.txt b/apps/igmpproxy/app/target/checkstyle-header.txt
deleted file mode 100644
index 3de16d3a6c1c57389909ec2e8d794ab546d544ae..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/checkstyle-header.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Copyright 20[1-2][0-9].* Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 \(the "License"\);
diff --git a/apps/igmpproxy/app/target/checkstyle-result.xml b/apps/igmpproxy/app/target/checkstyle-result.xml
deleted file mode 100644
index 351960ab6d9bb6762eee474f49cfc618f3e2c24f..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/checkstyle-result.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle version="8.10">
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachine.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/OsgiPropertyConstants.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/DelayMember.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/IdleMember.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/AbstractState.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/NonMember.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineStoreDelegate.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/AbstractStateMachineStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineEvent.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/DistributedStateMachineStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/package-info.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMember.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/DistributedGroupMemberStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStoreDelegate.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/AbstractGroupMemberStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStore.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberEvent.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/StateMachineManager.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachineSerializer.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxyConfig.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpStatisticsManager.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpLeadershipManager.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerTest.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerBase.java">
-</file>
-<file name="/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpStatisticsTest.java">
-</file>
-</checkstyle>
diff --git a/apps/igmpproxy/app/target/checkstyle-suppressions.xml b/apps/igmpproxy/app/target/checkstyle-suppressions.xml
deleted file mode 100644
index c972216a012fdaf705fda39a9a37f7f27126477a..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <suppress files="org.apache.karaf.branding.*" checks="[a-zA-Z0-9]*"/>
-
-    <suppress files=".*" checks="FinalParametersCheck"/>
-    <suppress files=".*" checks="MagicNumbersCheck"/>
-    <suppress files=".*" checks="DesignForExtensionCheck"/>
-    <suppress files=".*" checks="TodoCommentCheck"/>
-    <suppress files=".*" checks="AvoidInlineConditionalsCheck"/>
-    <suppress files=".*" checks="OperatorWrapCheck"/>
-    <suppress files=".*" checks="HiddenField"/>
-    <suppress files=".java" checks="NewlineAtEndOfFile"/>
-    <suppress files="org.onlab.packet.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onlab.jdvue.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.ofdpa.Ofdpa2GroupHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.segmentrouting.DefaultRoutingHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.mcast.McastHandler" checks="FileLength" />
-    <suppress files="org.onosproject.dhcprelay.Dhcp4HandlerImpl" checks="FileLength" />
-
-    <!-- These files carry AT&T copyrights -->
-    <suppress files="org.onlab.packet.EAP" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.EAPOL" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUS" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUSAttribute" checks="RegexpHeader" />
-
-    <!-- Suppressions for unit testing code -->
-    <suppress checks="Javadoc(Package|Method)"
-              files=".*/src/test/.*.java"
-            />
-
-    <suppress checks="Javadoc.*"
-              files=".*/thirdparty/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/kafkaintegration/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/demo/.*.java"/>
-
-    <suppress checks="FileLength"
-              files=".*/SegmentRoutingManager.java"/>
-    <suppress checks="FileLength"
-              files=".*/Ofdpa2GroupHandler.java"/>
-
-    <!-- Suppressions for yangutils generated code -->
-    <suppress files="org.onosproject.yang.gen.v1.*" checks="Javadoc.*" />
-
-    <suppress files="ApiDocRegistrator.java" checks="JavadocPackage" />
-</suppressions>
diff --git a/apps/igmpproxy/app/target/maven-archiver/pom.properties b/apps/igmpproxy/app/target/maven-archiver/pom.properties
deleted file mode 100644
index d81f93489ab1d40c5c9b40aa387dabf030d68dee..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/maven-archiver/pom.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-artifactId=onos-app-igmpproxy-app
-groupId=org.opencord
-version=2.7.0
diff --git a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 5d06b6fbc57baf4c2265fbbd7beddad6b3726f1f..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,35 +0,0 @@
-org/opencord/igmpproxy/impl/OsgiPropertyConstants.class
-org/opencord/igmpproxy/impl/store/groupmember/GroupMemberEvent$Type.class
-org/opencord/igmpproxy/impl/IgmpproxyConfig.class
-org/opencord/igmpproxy/impl/IgmpManager$4.class
-org/opencord/igmpproxy/impl/state/IdleMember.class
-org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStore.class
-org/opencord/igmpproxy/impl/state/DelayMember.class
-org/opencord/igmpproxy/impl/IgmpManager$InternalDeviceListener.class
-org/opencord/igmpproxy/impl/store/machine/StateMachineEvent$Type.class
-org/opencord/igmpproxy/impl/IgmpManager$2.class
-org/opencord/igmpproxy/impl/store/machine/StateMachineEvent.class
-org/opencord/igmpproxy/impl/store/machine/AbstractStateMachineStore.class
-org/opencord/igmpproxy/impl/StateMachineManager.class
-org/opencord/igmpproxy/impl/store/groupmember/AbstractGroupMemberStore.class
-org/opencord/igmpproxy/impl/IgmpLeadershipManager.class
-org/opencord/igmpproxy/impl/store/machine/StateMachineStoreDelegate.class
-org/opencord/igmpproxy/impl/IgmpManager$IgmpPacketProcessor.class
-org/opencord/igmpproxy/impl/IgmpManager$InternalNetworkConfigListener.class
-org/opencord/igmpproxy/impl/state/NonMember.class
-org/opencord/igmpproxy/impl/IgmpManager$IgmpProxyTimerTask.class
-org/opencord/igmpproxy/impl/SingleStateMachine.class
-org/opencord/igmpproxy/impl/IgmpSender.class
-org/opencord/igmpproxy/impl/store/machine/DistributedStateMachineStore.class
-org/opencord/igmpproxy/impl/store/groupmember/GroupMemberEvent.class
-org/opencord/igmpproxy/impl/SingleStateMachineSerializer.class
-org/opencord/igmpproxy/impl/IgmpManager$1.class
-org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.class
-org/opencord/igmpproxy/impl/state/AbstractState.class
-org/opencord/igmpproxy/impl/IgmpManager$3.class
-org/opencord/igmpproxy/impl/IgmpStatisticsManager.class
-org/opencord/igmpproxy/impl/store/machine/StateMachineStore.class
-org/opencord/igmpproxy/impl/store/groupmember/DistributedGroupMemberStore.class
-org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStoreDelegate.class
-org/opencord/igmpproxy/impl/IgmpManager.class
-org/opencord/igmpproxy/impl/store/groupmember/GroupMember.class
diff --git a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index ebb964df3f06f0cc02f581ec9712ff596795482b..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,29 +0,0 @@
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachineSerializer.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxyConfig.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpproxySsmTranslateConfig.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/package-info.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineEvent.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/AbstractState.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpStatisticsManager.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/StateMachineManager.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/AbstractGroupMemberStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/AbstractStateMachineStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpManager.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/DistributedGroupMemberStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpLeadershipManager.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/DelayMember.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberStoreDelegate.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/IdleMember.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMemberEvent.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/package-info.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/state/NonMember.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/StateMachineStoreDelegate.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/OsgiPropertyConstants.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/package-info.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/package-info.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/SingleStateMachine.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/machine/DistributedStateMachineStore.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/store/groupmember/GroupMember.java
-/usr/src/igmpproxy/app/src/main/java/org/opencord/igmpproxy/impl/IgmpSender.java
diff --git a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
deleted file mode 100644
index fb3bb4258ec5fb71d4e01c9ba06368cd3af4b72f..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ /dev/null
@@ -1,23 +0,0 @@
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockBpService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$1.class
-org/opencord/igmpproxy/impl/IgmpManagerBase.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestStateMachineStoreService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestIgmpLeaderShipService.class
-org/opencord/igmpproxy/impl/IgmpStatisticsTest$MockIgmpStatisticsEventListener.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestNetworkConfigRegistry.class
-org/opencord/igmpproxy/impl/IgmpStatisticsTest.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockMastershipService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestPacketContext.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$2.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockSadisService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockCfgService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockSubService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestMulticastRouteService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestGroupMemberStoreService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockComponentContext.class
-org/opencord/igmpproxy/impl/IgmpManagerTest.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockSubscriberAndDeviceInformation.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockIgmpProxyConfig.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$TestEventDispatcher.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockPacketService.class
-org/opencord/igmpproxy/impl/IgmpManagerBase$MockDeviceService.class
diff --git a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
deleted file mode 100644
index e1f740a1a9730681577e7588a48b97bbbb6ea065..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerBase.java
-/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpStatisticsTest.java
-/usr/src/igmpproxy/app/src/test/java/org/opencord/igmpproxy/impl/IgmpManagerTest.java
diff --git a/apps/igmpproxy/app/target/oar/app.xml b/apps/igmpproxy/app/target/oar/app.xml
deleted file mode 100644
index ae43ab56148195182fb53a15b5d64a105873f5cc..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/oar/app.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2017 Nokia
-  ~
-  ~ 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.
-  -->
-<app name="org.opencord.igmpproxy" origin="Nokia" version="2.7.0"
-     category="Traffic Steering" url="http://onosproject.org" title="IGMPProxy application for CORD"
-     featuresRepo="mvn:org.opencord/onos-app-igmpproxy-app/2.7.0/xml/features"
-     features="onos-app-igmpproxy-app">
-    <description>IGMP PROXY APP</description>
-    <artifact>mvn:org.opencord/onos-app-igmpproxy-app/2.7.0</artifact>
-    <artifact>mvn:org.opencord/onos-app-igmpproxy-api/2.7.0</artifact>
-    <artifact>mvn:org.opencord/sadis-api/5.10.0</artifact>
-    <artifact>mvn:org.onosproject/onos-apps-mcast-api/2.5.5</artifact>
-</app>
diff --git a/apps/igmpproxy/app/target/oar/m2/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar b/apps/igmpproxy/app/target/oar/m2/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar
deleted file mode 100644
index a9048691357af39e7fbde4ec2208cb0839aa9b22..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/oar/m2/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-api/2.7.0/onos-app-igmpproxy-api-2.7.0.jar b/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-api/2.7.0/onos-app-igmpproxy-api-2.7.0.jar
deleted file mode 100644
index 3cbea64d7829a423e6455aa38a897719d0091a64..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-api/2.7.0/onos-app-igmpproxy-api-2.7.0.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0-features.xml b/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0-features.xml
deleted file mode 100644
index 343a82756765f82bdafb7b479a2c91ccb4671760..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0-features.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  ~ Copyright 2018-2023 Open Networking Foundation (ONF) and the ONF Contributors
-  ~
-  ~ 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.
-  -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="onos-app-igmpproxy-app-2.7.0">
-    <feature name="onos-app-igmpproxy-app" version="2.7.0"
-             description="IGMP implementation.">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.opencord/onos-app-igmpproxy-api/2.7.0</bundle>
-        <bundle>mvn:org.opencord/onos-app-igmpproxy-app/2.7.0</bundle>
-        <bundle>mvn:org.opencord/sadis-api/5.10.0</bundle>
-        <bundle>mvn:org.onosproject/onos-apps-mcast-api/2.5.5</bundle>
-    </feature>
-</features>
diff --git a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0.jar b/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0.jar
deleted file mode 100644
index 81c9a737af6c8ef7769672149a0b0a4b5613ac9c..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/oar/m2/org/opencord/onos-app-igmpproxy-app/2.7.0/onos-app-igmpproxy-app-2.7.0.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/oar/m2/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar b/apps/igmpproxy/app/target/oar/m2/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar
deleted file mode 100644
index 35f6abae83c619495e88df410a1e4cf23fcac026..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/oar/m2/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0-tests.jar b/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0-tests.jar
deleted file mode 100644
index 916a54c4da5ab5363067f1f2fbe7f87dec58a407..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0-tests.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.jar b/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.jar
deleted file mode 100644
index 81c9a737af6c8ef7769672149a0b0a4b5613ac9c..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.jar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.oar b/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.oar
deleted file mode 100644
index db370b46a70910a02e27a79714509c7fd624092b..0000000000000000000000000000000000000000
Binary files a/apps/igmpproxy/app/target/onos-app-igmpproxy-app-2.7.0.oar and /dev/null differ
diff --git a/apps/igmpproxy/app/target/surefire-reports/2023-12-12T00-58-42_973.dumpstream b/apps/igmpproxy/app/target/surefire-reports/2023-12-12T00-58-42_973.dumpstream
deleted file mode 100644
index 86660525ee79999d5059d2c0a1551dec54045e9c..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/2023-12-12T00-58-42_973.dumpstream
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created at 2023-12-12T00:59:03.305
-WARNING: An illegal reflective access operation has occurred
-
-# Created at 2023-12-12T00:59:03.305
-WARNING: Illegal reflective access by com.esotericsoftware.kryo.serializers.ClosureSerializer (file:/root/.m2/repository/com/esotericsoftware/kryo/4.0.1/kryo-4.0.1.jar) to method java.lang.invoke.SerializedLambda.readResolve()
-
-# Created at 2023-12-12T00:59:03.305
-WARNING: Please consider reporting this to the maintainers of com.esotericsoftware.kryo.serializers.ClosureSerializer
-
-# Created at 2023-12-12T00:59:03.305
-WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
-
-# Created at 2023-12-12T00:59:03.305
-WARNING: All illegal access operations will be denied in a future release
-
diff --git a/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpManagerTest.xml b/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpManagerTest.xml
deleted file mode 100644
index fd6aa9e76e6675871941a761558cccc88aaae0d7..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpManagerTest.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="org.opencord.igmpproxy.impl.IgmpManagerTest" time="1.028" tests="4" errors="0" skipped="0" failures="0">
-  <properties>
-    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
-    <property name="java.specification.version" value="11"/>
-    <property name="sun.cpu.isalist" value=""/>
-    <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/usr/src/igmpproxy/app/target/test-classes:/usr/src/igmpproxy/app/target/classes:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5-tests.jar:/root/.m2/repository/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.jar:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/root/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:/root/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:/root/.m2/repository/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:/root/.m2/repository/commons-io/commons-io/2.6/commons-io-2.6.jar:/root/.m2/repository/commons-pool/commons-pool/1.6/commons-pool-1.6.jar:/root/.m2/repository/org/apache/karaf/features/org.apache.karaf.features.core/4.2.9/org.apache.karaf.features.core-4.2.9.jar:/root/.m2/repository/org/ops4j/pax/url/pax-url-aether/2.6.2/pax-url-aether-2.6.2.jar:/root/.m2/repository/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-property/1.5.1/ops4j-base-util-property-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-collections/1.5.1/ops4j-base-util-collections-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-lang/1.5.1/ops4j-base-lang-1.5.1.jar:/root/.m2/repository/org/ops4j/pax/swissbox/pax-swissbox-property/1.8.3/pax-swissbox-property-1.8.3.jar:/root/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar:/root/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar:/root/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar:/root/.m2/repository/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar:/root/.m2/repository/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar:/root/.m2/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar:/root/.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar:/root/.m2/repository/org/apache/karaf/system/org.apache.karaf.system.core/4.2.9/org.apache.karaf.system.core-4.2.9.jar:/root/.m2/repository/org/apache/karaf/org.apache.karaf.util/4.2.9/org.apache.karaf.util-4.2.9.jar:/root/.m2/repository/org/apache/felix/org.apache.felix.utils/1.11.2/org.apache.felix.utils-1.11.2.jar:/root/.m2/repository/org/apache/servicemix/bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5/org.apache.servicemix.bundles.dom4j-1.6.1_5.jar:/root/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar:/root/.m2/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar:/root/.m2/repository/io/netty/netty-buffer/4.1.35.Final/netty-buffer-4.1.35.Final.jar:/root/.m2/repository/io/netty/netty-common/4.1.35.Final/netty-common-4.1.35.Final.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-core/3.2.2/metrics-core-3.2.2.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-json/3.2.2/metrics-json-3.2.2.jar:/root/.m2/repository/com/esotericsoftware/kryo/4.0.1/kryo-4.0.1.jar:/root/.m2/repository/com/esotericsoftware/reflectasm/1.11.7/reflectasm-1.11.7.jar:/root/.m2/repository/org/ow2/asm/asm/5.2/asm-5.2.jar:/root/.m2/repository/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar:/root/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar:/root/.m2/repository/org/onosproject/onlab-rest/2.5.5/onlab-rest-2.5.5.jar:/root/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27.jar:/root/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27.jar:/root/.m2/repository/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27.jar:/root/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:/root/.m2/repository/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42.jar:/root/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:/root/.m2/repository/org/glassfish/jersey/inject/jersey-hk2/2.27/jersey-hk2-2.27.jar:/root/.m2/repository/org/glassfish/hk2/hk2-locator/2.5.0-b42/hk2-locator-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b42/aopalliance-repackaged-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/hk2-api/2.5.0-b42/hk2-api-2.5.0-b42.jar:/root/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/root/.m2/repository/org/glassfish/hk2/hk2-utils/2.5.0-b42/hk2-utils-2.5.0-b42.jar:/root/.m2/repository/org/javassist/javassist/3.22.0-CR2/javassist-3.22.0-CR2.jar:/root/.m2/repository/joda-time/joda-time/2.9.3/joda-time-2.9.3.jar:/root/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar:/root/.m2/repository/org/onosproject/onos-cli/2.5.5/onos-cli-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5.jar:/root/.m2/repository/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.9/org.apache.karaf.shell.core-4.2.9.jar:/root/.m2/repository/org/jline/jline/3.14.1/jline-3.14.1.jar:/root/.m2/repository/org/apache/karaf/jaas/org.apache.karaf.jaas.boot/4.2.9/org.apache.karaf.jaas.boot-4.2.9.jar:/root/.m2/repository/org/apache/sshd/sshd-core/1.7.0/sshd-core-1.7.0.jar:/root/.m2/repository/org/onosproject/onos-core-common/2.5.5/onos-core-common-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-core-serializers/2.5.5/onos-core-serializers-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-osgi/2.5.5/onlab-osgi-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-junit/2.5.5/onlab-junit-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-misc/2.5.5/onlab-misc-2.5.5.jar:/root/.m2/repository/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar:/usr/src/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar:/root/.m2/repository/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar:/root/.m2/repository/com/google/guava/guava/22.0/guava-22.0.jar:/root/.m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar:/root/.m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar:/root/.m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar:/root/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.4.0/org.osgi.service.component.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component/1.4.0/org.osgi.service.component-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.metatype.annotations/1.4.0/org.osgi.service.metatype.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.util.promise/1.1.1/org.osgi.util.promise-1.1.1.jar:/root/.m2/repository/org/osgi/osgi.cmpn/6.0.0/osgi.cmpn-6.0.0.jar:/root/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:/root/.m2/repository/com/google/guava/guava-testlib/22.0/guava-testlib-22.0.jar:/root/.m2/repository/com/spotify/hamcrest-optional/1.1.0/hamcrest-optional-1.1.0.jar:/root/.m2/repository/org/hamcrest/hamcrest-junit/2.0.0.0/hamcrest-junit-2.0.0.0.jar:/root/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar:/root/.m2/repository/junit/junit/4.12/junit-4.12.jar:/root/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/root/.m2/repository/org/easymock/easymock/4.0.2/easymock-4.0.2.jar:/root/.m2/repository/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar:"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.vendor.url" value="https://openjdk.java.net/"/>
-    <property name="user.timezone" value=""/>
-    <property name="java.vm.specification.version" value="11"/>
-    <property name="os.name" value="Linux"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.boot.library.path" value="/usr/local/openjdk-11/lib"/>
-    <property name="sun.java.command" value="/usr/src/igmpproxy/app/target/surefire/surefirebooter17001515338113753908.jar /usr/src/igmpproxy/app/target/surefire 2023-12-12T00-58-42_973-jvmRun1 surefire8774969119484992134tmp surefire_02303929319064719725tmp"/>
-    <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/usr/src/igmpproxy/app/target/test-classes:/usr/src/igmpproxy/app/target/classes:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5-tests.jar:/root/.m2/repository/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.jar:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/root/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:/root/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:/root/.m2/repository/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:/root/.m2/repository/commons-io/commons-io/2.6/commons-io-2.6.jar:/root/.m2/repository/commons-pool/commons-pool/1.6/commons-pool-1.6.jar:/root/.m2/repository/org/apache/karaf/features/org.apache.karaf.features.core/4.2.9/org.apache.karaf.features.core-4.2.9.jar:/root/.m2/repository/org/ops4j/pax/url/pax-url-aether/2.6.2/pax-url-aether-2.6.2.jar:/root/.m2/repository/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-property/1.5.1/ops4j-base-util-property-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-collections/1.5.1/ops4j-base-util-collections-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-lang/1.5.1/ops4j-base-lang-1.5.1.jar:/root/.m2/repository/org/ops4j/pax/swissbox/pax-swissbox-property/1.8.3/pax-swissbox-property-1.8.3.jar:/root/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar:/root/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar:/root/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar:/root/.m2/repository/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar:/root/.m2/repository/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar:/root/.m2/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar:/root/.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar:/root/.m2/repository/org/apache/karaf/system/org.apache.karaf.system.core/4.2.9/org.apache.karaf.system.core-4.2.9.jar:/root/.m2/repository/org/apache/karaf/org.apache.karaf.util/4.2.9/org.apache.karaf.util-4.2.9.jar:/root/.m2/repository/org/apache/felix/org.apache.felix.utils/1.11.2/org.apache.felix.utils-1.11.2.jar:/root/.m2/repository/org/apache/servicemix/bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5/org.apache.servicemix.bundles.dom4j-1.6.1_5.jar:/root/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar:/root/.m2/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar:/root/.m2/repository/io/netty/netty-buffer/4.1.35.Final/netty-buffer-4.1.35.Final.jar:/root/.m2/repository/io/netty/netty-common/4.1.35.Final/netty-common-4.1.35.Final.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-core/3.2.2/metrics-core-3.2.2.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-json/3.2.2/metrics-json-3.2.2.jar:/root/.m2/repository/com/esotericsoftware/kryo/4.0.1/kryo-4.0.1.jar:/root/.m2/repository/com/esotericsoftware/reflectasm/1.11.7/reflectasm-1.11.7.jar:/root/.m2/repository/org/ow2/asm/asm/5.2/asm-5.2.jar:/root/.m2/repository/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar:/root/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar:/root/.m2/repository/org/onosproject/onlab-rest/2.5.5/onlab-rest-2.5.5.jar:/root/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27.jar:/root/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27.jar:/root/.m2/repository/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27.jar:/root/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:/root/.m2/repository/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42.jar:/root/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:/root/.m2/repository/org/glassfish/jersey/inject/jersey-hk2/2.27/jersey-hk2-2.27.jar:/root/.m2/repository/org/glassfish/hk2/hk2-locator/2.5.0-b42/hk2-locator-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b42/aopalliance-repackaged-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/hk2-api/2.5.0-b42/hk2-api-2.5.0-b42.jar:/root/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/root/.m2/repository/org/glassfish/hk2/hk2-utils/2.5.0-b42/hk2-utils-2.5.0-b42.jar:/root/.m2/repository/org/javassist/javassist/3.22.0-CR2/javassist-3.22.0-CR2.jar:/root/.m2/repository/joda-time/joda-time/2.9.3/joda-time-2.9.3.jar:/root/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar:/root/.m2/repository/org/onosproject/onos-cli/2.5.5/onos-cli-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5.jar:/root/.m2/repository/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.9/org.apache.karaf.shell.core-4.2.9.jar:/root/.m2/repository/org/jline/jline/3.14.1/jline-3.14.1.jar:/root/.m2/repository/org/apache/karaf/jaas/org.apache.karaf.jaas.boot/4.2.9/org.apache.karaf.jaas.boot-4.2.9.jar:/root/.m2/repository/org/apache/sshd/sshd-core/1.7.0/sshd-core-1.7.0.jar:/root/.m2/repository/org/onosproject/onos-core-common/2.5.5/onos-core-common-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-core-serializers/2.5.5/onos-core-serializers-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-osgi/2.5.5/onlab-osgi-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-junit/2.5.5/onlab-junit-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-misc/2.5.5/onlab-misc-2.5.5.jar:/root/.m2/repository/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar:/usr/src/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar:/root/.m2/repository/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar:/root/.m2/repository/com/google/guava/guava/22.0/guava-22.0.jar:/root/.m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar:/root/.m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar:/root/.m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar:/root/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.4.0/org.osgi.service.component.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component/1.4.0/org.osgi.service.component-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.metatype.annotations/1.4.0/org.osgi.service.metatype.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.util.promise/1.1.1/org.osgi.util.promise-1.1.1.jar:/root/.m2/repository/org/osgi/osgi.cmpn/6.0.0/osgi.cmpn-6.0.0.jar:/root/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:/root/.m2/repository/com/google/guava/guava-testlib/22.0/guava-testlib-22.0.jar:/root/.m2/repository/com/spotify/hamcrest-optional/1.1.0/hamcrest-optional-1.1.0.jar:/root/.m2/repository/org/hamcrest/hamcrest-junit/2.0.0.0/hamcrest-junit-2.0.0.0.jar:/root/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar:/root/.m2/repository/junit/junit/4.12/junit-4.12.jar:/root/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/root/.m2/repository/org/easymock/easymock/4.0.2/easymock-4.0.2.jar:/root/.m2/repository/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar:"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="/root"/>
-    <property name="user.language" value="en"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.version.date" value="2022-07-19"/>
-    <property name="java.home" value="/usr/local/openjdk-11"/>
-    <property name="file.separator" value="/"/>
-    <property name="basedir" value="/usr/src/igmpproxy/app"/>
-    <property name="java.vm.compressedOopsMode" value="Zero based"/>
-    <property name="line.separator" value="&#10;"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/usr/src/igmpproxy/app/target/surefire/surefirebooter17001515338113753908.jar"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="java.runtime.version" value="11.0.16+8"/>
-    <property name="user.name" value="root"/>
-    <property name="path.separator" value=":"/>
-    <property name="os.version" value="6.6.5-arch1-1"/>
-    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
-    <property name="file.encoding" value="UTF-8"/>
-    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="java.vendor.version" value="18.9"/>
-    <property name="localRepository" value="/root/.m2/repository"/>
-    <property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/>
-    <property name="java.io.tmpdir" value="/tmp"/>
-    <property name="java.version" value="11.0.16"/>
-    <property name="user.dir" value="/usr/src/igmpproxy/app"/>
-    <property name="os.arch" value="amd64"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.library.path" value="/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib"/>
-    <property name="java.vm.info" value="mixed mode, sharing"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="java.vm.version" value="11.0.16+8"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="java.class.version" value="55.0"/>
-  </properties>
-  <testcase name="testIgmpOnPodBasisDefaultValue" classname="org.opencord.igmpproxy.impl.IgmpManagerTest" time="0"/>
-  <testcase name="testIsIgmpOnPodBasisTrueValue" classname="org.opencord.igmpproxy.impl.IgmpManagerTest" time="0.006"/>
-  <testcase name="testIgmpOnPodBasisTrueValue" classname="org.opencord.igmpproxy.impl.IgmpManagerTest" time="1.009"/>
-  <testcase name="testIsIgmpOnPodBasisDefaultValue" classname="org.opencord.igmpproxy.impl.IgmpManagerTest" time="0.01"/>
-</testsuite>
\ No newline at end of file
diff --git a/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpStatisticsTest.xml b/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpStatisticsTest.xml
deleted file mode 100644
index d01a0cd04e887d25b2964892dde1c32ba1fcb068..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/TEST-org.opencord.igmpproxy.impl.IgmpStatisticsTest.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://maven.apache.org/surefire/maven-surefire-plugin/xsd/surefire-test-report-3.0.xsd" version="3.0" name="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="5.345" tests="7" errors="0" skipped="0" failures="0">
-  <properties>
-    <property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
-    <property name="java.specification.version" value="11"/>
-    <property name="sun.cpu.isalist" value=""/>
-    <property name="sun.jnu.encoding" value="UTF-8"/>
-    <property name="java.class.path" value="/usr/src/igmpproxy/app/target/test-classes:/usr/src/igmpproxy/app/target/classes:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5-tests.jar:/root/.m2/repository/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.jar:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/root/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:/root/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:/root/.m2/repository/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:/root/.m2/repository/commons-io/commons-io/2.6/commons-io-2.6.jar:/root/.m2/repository/commons-pool/commons-pool/1.6/commons-pool-1.6.jar:/root/.m2/repository/org/apache/karaf/features/org.apache.karaf.features.core/4.2.9/org.apache.karaf.features.core-4.2.9.jar:/root/.m2/repository/org/ops4j/pax/url/pax-url-aether/2.6.2/pax-url-aether-2.6.2.jar:/root/.m2/repository/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-property/1.5.1/ops4j-base-util-property-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-collections/1.5.1/ops4j-base-util-collections-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-lang/1.5.1/ops4j-base-lang-1.5.1.jar:/root/.m2/repository/org/ops4j/pax/swissbox/pax-swissbox-property/1.8.3/pax-swissbox-property-1.8.3.jar:/root/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar:/root/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar:/root/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar:/root/.m2/repository/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar:/root/.m2/repository/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar:/root/.m2/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar:/root/.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar:/root/.m2/repository/org/apache/karaf/system/org.apache.karaf.system.core/4.2.9/org.apache.karaf.system.core-4.2.9.jar:/root/.m2/repository/org/apache/karaf/org.apache.karaf.util/4.2.9/org.apache.karaf.util-4.2.9.jar:/root/.m2/repository/org/apache/felix/org.apache.felix.utils/1.11.2/org.apache.felix.utils-1.11.2.jar:/root/.m2/repository/org/apache/servicemix/bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5/org.apache.servicemix.bundles.dom4j-1.6.1_5.jar:/root/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar:/root/.m2/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar:/root/.m2/repository/io/netty/netty-buffer/4.1.35.Final/netty-buffer-4.1.35.Final.jar:/root/.m2/repository/io/netty/netty-common/4.1.35.Final/netty-common-4.1.35.Final.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-core/3.2.2/metrics-core-3.2.2.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-json/3.2.2/metrics-json-3.2.2.jar:/root/.m2/repository/com/esotericsoftware/kryo/4.0.1/kryo-4.0.1.jar:/root/.m2/repository/com/esotericsoftware/reflectasm/1.11.7/reflectasm-1.11.7.jar:/root/.m2/repository/org/ow2/asm/asm/5.2/asm-5.2.jar:/root/.m2/repository/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar:/root/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar:/root/.m2/repository/org/onosproject/onlab-rest/2.5.5/onlab-rest-2.5.5.jar:/root/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27.jar:/root/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27.jar:/root/.m2/repository/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27.jar:/root/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:/root/.m2/repository/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42.jar:/root/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:/root/.m2/repository/org/glassfish/jersey/inject/jersey-hk2/2.27/jersey-hk2-2.27.jar:/root/.m2/repository/org/glassfish/hk2/hk2-locator/2.5.0-b42/hk2-locator-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b42/aopalliance-repackaged-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/hk2-api/2.5.0-b42/hk2-api-2.5.0-b42.jar:/root/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/root/.m2/repository/org/glassfish/hk2/hk2-utils/2.5.0-b42/hk2-utils-2.5.0-b42.jar:/root/.m2/repository/org/javassist/javassist/3.22.0-CR2/javassist-3.22.0-CR2.jar:/root/.m2/repository/joda-time/joda-time/2.9.3/joda-time-2.9.3.jar:/root/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar:/root/.m2/repository/org/onosproject/onos-cli/2.5.5/onos-cli-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5.jar:/root/.m2/repository/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.9/org.apache.karaf.shell.core-4.2.9.jar:/root/.m2/repository/org/jline/jline/3.14.1/jline-3.14.1.jar:/root/.m2/repository/org/apache/karaf/jaas/org.apache.karaf.jaas.boot/4.2.9/org.apache.karaf.jaas.boot-4.2.9.jar:/root/.m2/repository/org/apache/sshd/sshd-core/1.7.0/sshd-core-1.7.0.jar:/root/.m2/repository/org/onosproject/onos-core-common/2.5.5/onos-core-common-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-core-serializers/2.5.5/onos-core-serializers-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-osgi/2.5.5/onlab-osgi-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-junit/2.5.5/onlab-junit-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-misc/2.5.5/onlab-misc-2.5.5.jar:/root/.m2/repository/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar:/usr/src/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar:/root/.m2/repository/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar:/root/.m2/repository/com/google/guava/guava/22.0/guava-22.0.jar:/root/.m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar:/root/.m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar:/root/.m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar:/root/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.4.0/org.osgi.service.component.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component/1.4.0/org.osgi.service.component-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.metatype.annotations/1.4.0/org.osgi.service.metatype.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.util.promise/1.1.1/org.osgi.util.promise-1.1.1.jar:/root/.m2/repository/org/osgi/osgi.cmpn/6.0.0/osgi.cmpn-6.0.0.jar:/root/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:/root/.m2/repository/com/google/guava/guava-testlib/22.0/guava-testlib-22.0.jar:/root/.m2/repository/com/spotify/hamcrest-optional/1.1.0/hamcrest-optional-1.1.0.jar:/root/.m2/repository/org/hamcrest/hamcrest-junit/2.0.0.0/hamcrest-junit-2.0.0.0.jar:/root/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar:/root/.m2/repository/junit/junit/4.12/junit-4.12.jar:/root/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/root/.m2/repository/org/easymock/easymock/4.0.2/easymock-4.0.2.jar:/root/.m2/repository/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar:"/>
-    <property name="java.vm.vendor" value="Oracle Corporation"/>
-    <property name="sun.arch.data.model" value="64"/>
-    <property name="java.vendor.url" value="https://openjdk.java.net/"/>
-    <property name="user.timezone" value=""/>
-    <property name="java.vm.specification.version" value="11"/>
-    <property name="os.name" value="Linux"/>
-    <property name="sun.java.launcher" value="SUN_STANDARD"/>
-    <property name="sun.boot.library.path" value="/usr/local/openjdk-11/lib"/>
-    <property name="sun.java.command" value="/usr/src/igmpproxy/app/target/surefire/surefirebooter17001515338113753908.jar /usr/src/igmpproxy/app/target/surefire 2023-12-12T00-58-42_973-jvmRun1 surefire8774969119484992134tmp surefire_02303929319064719725tmp"/>
-    <property name="jdk.debug" value="release"/>
-    <property name="surefire.test.class.path" value="/usr/src/igmpproxy/app/target/test-classes:/usr/src/igmpproxy/app/target/classes:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5-tests.jar:/root/.m2/repository/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.jar:/root/.m2/repository/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:/root/.m2/repository/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar:/root/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6.jar:/root/.m2/repository/org/apache/commons/commons-lang3/3.7/commons-lang3-3.7.jar:/root/.m2/repository/commons-io/commons-io/2.6/commons-io-2.6.jar:/root/.m2/repository/commons-pool/commons-pool/1.6/commons-pool-1.6.jar:/root/.m2/repository/org/apache/karaf/features/org.apache.karaf.features.core/4.2.9/org.apache.karaf.features.core-4.2.9.jar:/root/.m2/repository/org/ops4j/pax/url/pax-url-aether/2.6.2/pax-url-aether-2.6.2.jar:/root/.m2/repository/org/slf4j/jcl-over-slf4j/1.6.6/jcl-over-slf4j-1.6.6.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-property/1.5.1/ops4j-base-util-property-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-util-collections/1.5.1/ops4j-base-util-collections-1.5.1.jar:/root/.m2/repository/org/ops4j/base/ops4j-base-lang/1.5.1/ops4j-base-lang-1.5.1.jar:/root/.m2/repository/org/ops4j/pax/swissbox/pax-swissbox-property/1.8.3/pax-swissbox-property-1.8.3.jar:/root/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/2.3.3/jakarta.xml.bind-api-2.3.3.jar:/root/.m2/repository/jakarta/activation/jakarta.activation-api/1.2.2/jakarta.activation-api-1.2.2.jar:/root/.m2/repository/org/glassfish/jaxb/jaxb-runtime/2.3.3/jaxb-runtime-2.3.3.jar:/root/.m2/repository/org/glassfish/jaxb/txw2/2.3.3/txw2-2.3.3.jar:/root/.m2/repository/com/sun/istack/istack-commons-runtime/3.0.11/istack-commons-runtime-3.0.11.jar:/root/.m2/repository/com/sun/activation/jakarta.activation/1.2.2/jakarta.activation-1.2.2.jar:/root/.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar:/root/.m2/repository/org/apache/karaf/system/org.apache.karaf.system.core/4.2.9/org.apache.karaf.system.core-4.2.9.jar:/root/.m2/repository/org/apache/karaf/org.apache.karaf.util/4.2.9/org.apache.karaf.util-4.2.9.jar:/root/.m2/repository/org/apache/felix/org.apache.felix.utils/1.11.2/org.apache.felix.utils-1.11.2.jar:/root/.m2/repository/org/apache/servicemix/bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5/org.apache.servicemix.bundles.dom4j-1.6.1_5.jar:/root/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar:/root/.m2/repository/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar:/root/.m2/repository/io/netty/netty-buffer/4.1.35.Final/netty-buffer-4.1.35.Final.jar:/root/.m2/repository/io/netty/netty-common/4.1.35.Final/netty-common-4.1.35.Final.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-annotations/2.10.0/jackson-annotations-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-core/2.10.0/jackson-core-2.10.0.jar:/root/.m2/repository/com/fasterxml/jackson/core/jackson-databind/2.10.0/jackson-databind-2.10.0.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-core/3.2.2/metrics-core-3.2.2.jar:/root/.m2/repository/io/dropwizard/metrics/metrics-json/3.2.2/metrics-json-3.2.2.jar:/root/.m2/repository/com/esotericsoftware/kryo/4.0.1/kryo-4.0.1.jar:/root/.m2/repository/com/esotericsoftware/reflectasm/1.11.7/reflectasm-1.11.7.jar:/root/.m2/repository/org/ow2/asm/asm/5.2/asm-5.2.jar:/root/.m2/repository/com/esotericsoftware/minlog/1.3.0/minlog-1.3.0.jar:/root/.m2/repository/org/objenesis/objenesis/2.6/objenesis-2.6.jar:/root/.m2/repository/org/onosproject/onlab-rest/2.5.5/onlab-rest-2.5.5.jar:/root/.m2/repository/javax/ws/rs/javax.ws.rs-api/2.1/javax.ws.rs-api-2.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-server/2.27/jersey-server-2.27.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-common/2.27/jersey-common-2.27.jar:/root/.m2/repository/org/glassfish/hk2/osgi-resource-locator/1.0.1/osgi-resource-locator-1.0.1.jar:/root/.m2/repository/org/glassfish/jersey/core/jersey-client/2.27/jersey-client-2.27.jar:/root/.m2/repository/org/glassfish/jersey/media/jersey-media-jaxb/2.27/jersey-media-jaxb-2.27.jar:/root/.m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar:/root/.m2/repository/org/glassfish/hk2/external/javax.inject/2.5.0-b42/javax.inject-2.5.0-b42.jar:/root/.m2/repository/javax/validation/validation-api/1.1.0.Final/validation-api-1.1.0.Final.jar:/root/.m2/repository/org/glassfish/jersey/inject/jersey-hk2/2.27/jersey-hk2-2.27.jar:/root/.m2/repository/org/glassfish/hk2/hk2-locator/2.5.0-b42/hk2-locator-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/external/aopalliance-repackaged/2.5.0-b42/aopalliance-repackaged-2.5.0-b42.jar:/root/.m2/repository/org/glassfish/hk2/hk2-api/2.5.0-b42/hk2-api-2.5.0-b42.jar:/root/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/root/.m2/repository/org/glassfish/hk2/hk2-utils/2.5.0-b42/hk2-utils-2.5.0-b42.jar:/root/.m2/repository/org/javassist/javassist/3.22.0-CR2/javassist-3.22.0-CR2.jar:/root/.m2/repository/joda-time/joda-time/2.9.3/joda-time-2.9.3.jar:/root/.m2/repository/io/netty/netty/3.10.5.Final/netty-3.10.5.Final.jar:/root/.m2/repository/org/onosproject/onos-cli/2.5.5/onos-cli-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-api/2.5.5/onos-api-2.5.5.jar:/root/.m2/repository/org/apache/karaf/shell/org.apache.karaf.shell.core/4.2.9/org.apache.karaf.shell.core-4.2.9.jar:/root/.m2/repository/org/jline/jline/3.14.1/jline-3.14.1.jar:/root/.m2/repository/org/apache/karaf/jaas/org.apache.karaf.jaas.boot/4.2.9/org.apache.karaf.jaas.boot-4.2.9.jar:/root/.m2/repository/org/apache/sshd/sshd-core/1.7.0/sshd-core-1.7.0.jar:/root/.m2/repository/org/onosproject/onos-core-common/2.5.5/onos-core-common-2.5.5.jar:/root/.m2/repository/org/onosproject/onos-core-serializers/2.5.5/onos-core-serializers-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-osgi/2.5.5/onlab-osgi-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-junit/2.5.5/onlab-junit-2.5.5.jar:/root/.m2/repository/org/onosproject/onlab-misc/2.5.5/onlab-misc-2.5.5.jar:/root/.m2/repository/org/opencord/sadis-api/5.10.0/sadis-api-5.10.0.jar:/usr/src/igmpproxy/api/target/onos-app-igmpproxy-api-2.7.0.jar:/root/.m2/repository/org/onosproject/onos-apps-mcast-api/2.5.5/onos-apps-mcast-api-2.5.5.jar:/root/.m2/repository/com/google/guava/guava/22.0/guava-22.0.jar:/root/.m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.jar:/root/.m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar:/root/.m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar:/root/.m2/repository/org/osgi/org.osgi.core/6.0.0/org.osgi.core-6.0.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component.annotations/1.4.0/org.osgi.service.component.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.component/1.4.0/org.osgi.service.component-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.service.metatype.annotations/1.4.0/org.osgi.service.metatype.annotations-1.4.0.jar:/root/.m2/repository/org/osgi/org.osgi.util.promise/1.1.1/org.osgi.util.promise-1.1.1.jar:/root/.m2/repository/org/osgi/osgi.cmpn/6.0.0/osgi.cmpn-6.0.0.jar:/root/.m2/repository/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar:/root/.m2/repository/com/google/guava/guava-testlib/22.0/guava-testlib-22.0.jar:/root/.m2/repository/com/spotify/hamcrest-optional/1.1.0/hamcrest-optional-1.1.0.jar:/root/.m2/repository/org/hamcrest/hamcrest-junit/2.0.0.0/hamcrest-junit-2.0.0.0.jar:/root/.m2/repository/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar:/root/.m2/repository/junit/junit/4.12/junit-4.12.jar:/root/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/root/.m2/repository/org/easymock/easymock/4.0.2/easymock-4.0.2.jar:/root/.m2/repository/org/hamcrest/hamcrest-all/1.3/hamcrest-all-1.3.jar:"/>
-    <property name="sun.cpu.endian" value="little"/>
-    <property name="user.home" value="/root"/>
-    <property name="user.language" value="en"/>
-    <property name="java.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.version.date" value="2022-07-19"/>
-    <property name="java.home" value="/usr/local/openjdk-11"/>
-    <property name="file.separator" value="/"/>
-    <property name="basedir" value="/usr/src/igmpproxy/app"/>
-    <property name="java.vm.compressedOopsMode" value="Zero based"/>
-    <property name="line.separator" value="&#10;"/>
-    <property name="java.specification.name" value="Java Platform API Specification"/>
-    <property name="java.vm.specification.vendor" value="Oracle Corporation"/>
-    <property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
-    <property name="surefire.real.class.path" value="/usr/src/igmpproxy/app/target/surefire/surefirebooter17001515338113753908.jar"/>
-    <property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
-    <property name="java.runtime.version" value="11.0.16+8"/>
-    <property name="user.name" value="root"/>
-    <property name="path.separator" value=":"/>
-    <property name="os.version" value="6.6.5-arch1-1"/>
-    <property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
-    <property name="file.encoding" value="UTF-8"/>
-    <property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
-    <property name="java.vendor.version" value="18.9"/>
-    <property name="localRepository" value="/root/.m2/repository"/>
-    <property name="java.vendor.url.bug" value="https://bugreport.java.com/bugreport/"/>
-    <property name="java.io.tmpdir" value="/tmp"/>
-    <property name="java.version" value="11.0.16"/>
-    <property name="user.dir" value="/usr/src/igmpproxy/app"/>
-    <property name="os.arch" value="amd64"/>
-    <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
-    <property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
-    <property name="sun.os.patch.level" value="unknown"/>
-    <property name="java.library.path" value="/usr/java/packages/lib:/usr/lib64:/lib64:/lib:/usr/lib"/>
-    <property name="java.vm.info" value="mixed mode, sharing"/>
-    <property name="java.vendor" value="Oracle Corporation"/>
-    <property name="java.vm.version" value="11.0.16+8"/>
-    <property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
-    <property name="java.class.version" value="55.0"/>
-  </properties>
-  <testcase name="testIgmpUnknownMulticastIpAddress" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.746"/>
-  <testcase name="testIgmpQueryStatistics" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.52"/>
-  <testcase name="testUnknownIgmpPacket" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.515"/>
-  <testcase name="testIgmpStatistics" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.515"/>
-  <testcase name="testWrongIgmpPacket" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.515"/>
-  <testcase name="testIgmpStatisticsEvent" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="2.015"/>
-  <testcase name="testSufficientPermission" classname="org.opencord.igmpproxy.impl.IgmpStatisticsTest" time="0.51"/>
-</testsuite>
\ No newline at end of file
diff --git a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpManagerTest.txt b/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpManagerTest.txt
deleted file mode 100644
index 5d810c7c09dcd0358ebc369c5eecc35f445e87a2..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpManagerTest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.opencord.igmpproxy.impl.IgmpManagerTest
--------------------------------------------------------------------------------
-Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.028 s - in org.opencord.igmpproxy.impl.IgmpManagerTest
diff --git a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest-output.txt b/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest-output.txt
deleted file mode 100644
index 16fe39932aaeac0592dbd6b686f9089bec9c28ac..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest-output.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
-SLF4J: Defaulting to no-operation (NOP) logger implementation
-SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
diff --git a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest.txt b/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest.txt
deleted file mode 100644
index 6b19ac228a2fdc6a84bc9efa0eb4debc0d849e54..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/app/target/surefire-reports/org.opencord.igmpproxy.impl.IgmpStatisticsTest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: org.opencord.igmpproxy.impl.IgmpStatisticsTest
--------------------------------------------------------------------------------
-Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.345 s - in org.opencord.igmpproxy.impl.IgmpStatisticsTest
diff --git a/apps/igmpproxy/pom.xml b/apps/igmpproxy/pom.xml
index c041ebde075e2d6dea5b9e2669cf206b92f22a78..987b39883f7ee4a9836e4a7e02763a3c62b3395d 100644
--- a/apps/igmpproxy/pom.xml
+++ b/apps/igmpproxy/pom.xml
@@ -27,11 +27,11 @@
 
     <groupId>org.opencord</groupId>
     <artifactId>onos-app-igmpproxy</artifactId>
-    <version>2.7.0</version>
+    <version>2.9.0</version>
     <packaging>pom</packaging>
 
     <properties>
-        <igmpproxy.api.version>2.7.0</igmpproxy.api.version>
+        <igmpproxy.api.version>2.9.0</igmpproxy.api.version>
     </properties>
 
     <modules>
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.0.4</version>
+                <version>4.7.3.4</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -63,7 +63,7 @@
                         <plugin>
                             <groupId>com.h3xstream.findsecbugs</groupId>
                             <artifactId>findsecbugs-plugin</artifactId>
-                            <version>1.10.1</version>
+                            <version>1.12.0</version>
                         </plugin>
                     </plugins>
                 </configuration>
diff --git a/apps/igmpproxy/target/checkstyle-cachefile b/apps/igmpproxy/target/checkstyle-cachefile
deleted file mode 100644
index f8a8d127bc1094b679da837177d6687726d918b8..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/target/checkstyle-cachefile
+++ /dev/null
@@ -1,2 +0,0 @@
-#Tue Dec 12 00:57:58 UTC 2023
-configuration*?=0F3EE3392ECF688550C0C74B7FB3C9F71071ADF5
diff --git a/apps/igmpproxy/target/checkstyle-checker.xml b/apps/igmpproxy/target/checkstyle-checker.xml
deleted file mode 100644
index fcad23f064e1e0c019272a994fedd8a4c6d8e751..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/target/checkstyle-checker.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-
-<!--
-   The default severity setting in checkstyle is 'error', so some
-   of the rules below are configured to change the severity to
-   'warning'.  Over time, these 'warning' settings should be
-   removed as more of the ONOS source code is modified to
-   follow the recommended rules.
--->
-
-
-<module name="Checker">
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        http://checkstyle.sourceforge.net/5.x/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-    <module name="JavadocPackage"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <module name="RegexpMultiline">
-        <property name="format" value="\r\n"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has windows line endings."/>
-    </module>
-
-    <!-- Don't allow usage of deprecated Throwables propagate methods -->
-    <module name="RegexpSingleline">
-        <property name="format" value="Throwables.propagate.*\("/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Throwables propagate methods have been deprecated."/>
-    </module>
-
-    <!-- Don't allow usage of Oracle JDK only javafx classes -->
-    <module name="RegexpSingleline">
-        <property name="format" value="javafx.*"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="javafx classes are not supported by all JDKs."/>
-    </module>
-
-    <!-- Don't allow usage of RuntimeException -->
-    <module name="RegexpSingleline">
-        <property name="format" value="throw[ ]*new[ ]*RuntimeException"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Don't throw generic exception types"/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="SuppressWithPlainTextCommentFilter"/>
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat"
-                      value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
-        </module>
-
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
-            <property name="checkFormat" value=".*"/>
-            <property name="influenceFormat" value="0"/>
-        </module>
-
-        <!-- Example: // CHECKSTYLE IGNORE FinalClass FOR NEXT 1 LINES  -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat"
-                      value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
-            <property name="checkFormat" value="$1"/>
-            <property name="influenceFormat" value="$2"/>
-        </module>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod">
-            <property name="scope" value="package"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="JavadocType">
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocVariable">
-            <!-- Suppress check for private member Javadocs.
-             Possibly revist fixing these. -->
-            <property name="scope" value="public"/>
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocStyle"/>
-        <!-- @author tag should not be used -->
-        <module name="WriteTag">
-            <property name="tag" value="@author"/>
-            <property name="tagFormat" value="\S"/>
-            <property name="severity" value="ignore"/>
-            <property name="tagSeverity" value="error"/>
-        </module>
-
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="2"/>
-        </module>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName">
-            <!--  ONOS allows the name "log" for static final Loggers -->
-            <property name="format"
-                      value="^log$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-
-        <module name="LocalVariableName"/>
-
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-        </module>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="allowStaticMemberImports" value="true"/>
-        </module>
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <!-- ONOS standard usage is 80 columns, but we allow up
-             to 120 to not break the build. -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^import"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-        </module>
-
-        <module name="ParameterNumber">
-            <property name="max" value="15"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-
-        <!-- Disabled for ONOS.  Default rules specify undesired behavior for the '?' operator -->
-        <!-- <module name="OperatorWrap"/> -->
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-        </module>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-
-        <!--  Disabled for ONOS to allow use of public          -->
-        <!--  modifiers in interfaces.                          -->
-        <!-- <module name="RedundantModifier"/>                 -->
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks">
-            <!-- ONOS alows declarations inside of switch case blocks -->
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        <module name="EmptyBlock">
-            <!-- allow empty block, as long as there's some comment -->
-            <property name="option" value="text"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- ONOS allows conditional operators -->
-        <!-- <module name="AvoidInlineConditionals"/> -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-
-        <module name="HiddenField">
-            <property name="ignoreSetter" value="true"/>
-            <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-
-        <!-- Many violations of this rule present, revist in a
-        subsequent round of cleanups -->
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- ONOS produces many warnings of this type.
-        Fixing all of these is outside the scope of the current cleanup. -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-
-        <module name="HideUtilityClassConstructor"/>
-
-        <module name="InterfaceIsType"/>
-
-        <module name="VisibilityModifier">
-            <property name="severity" value="ignore"/>
-        </module>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-
-        <!--  Many violations of this rule currently, too many to fix
-        in the current cleanup. -->
-        <!-- <module name="FinalParameters"/> -->
-        <!-- ONOS allows TODO markers in checked in source code -->
-        <!-- <module name="TodoComment"/> -->
-        <module name="UpperEll"/>
-    </module>
-
-</module>
diff --git a/apps/igmpproxy/target/checkstyle-header.txt b/apps/igmpproxy/target/checkstyle-header.txt
deleted file mode 100644
index 3de16d3a6c1c57389909ec2e8d794ab546d544ae..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/target/checkstyle-header.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Copyright 20[1-2][0-9].* Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 \(the "License"\);
diff --git a/apps/igmpproxy/target/checkstyle-result.xml b/apps/igmpproxy/target/checkstyle-result.xml
deleted file mode 100644
index 625d5ed6d2ac4357dd08d9afe4b5957c59e844b3..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/target/checkstyle-result.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle version="8.10">
-</checkstyle>
diff --git a/apps/igmpproxy/target/checkstyle-suppressions.xml b/apps/igmpproxy/target/checkstyle-suppressions.xml
deleted file mode 100644
index c972216a012fdaf705fda39a9a37f7f27126477a..0000000000000000000000000000000000000000
--- a/apps/igmpproxy/target/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <suppress files="org.apache.karaf.branding.*" checks="[a-zA-Z0-9]*"/>
-
-    <suppress files=".*" checks="FinalParametersCheck"/>
-    <suppress files=".*" checks="MagicNumbersCheck"/>
-    <suppress files=".*" checks="DesignForExtensionCheck"/>
-    <suppress files=".*" checks="TodoCommentCheck"/>
-    <suppress files=".*" checks="AvoidInlineConditionalsCheck"/>
-    <suppress files=".*" checks="OperatorWrapCheck"/>
-    <suppress files=".*" checks="HiddenField"/>
-    <suppress files=".java" checks="NewlineAtEndOfFile"/>
-    <suppress files="org.onlab.packet.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onlab.jdvue.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.ofdpa.Ofdpa2GroupHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.segmentrouting.DefaultRoutingHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.mcast.McastHandler" checks="FileLength" />
-    <suppress files="org.onosproject.dhcprelay.Dhcp4HandlerImpl" checks="FileLength" />
-
-    <!-- These files carry AT&T copyrights -->
-    <suppress files="org.onlab.packet.EAP" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.EAPOL" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUS" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUSAttribute" checks="RegexpHeader" />
-
-    <!-- Suppressions for unit testing code -->
-    <suppress checks="Javadoc(Package|Method)"
-              files=".*/src/test/.*.java"
-            />
-
-    <suppress checks="Javadoc.*"
-              files=".*/thirdparty/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/kafkaintegration/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/demo/.*.java"/>
-
-    <suppress checks="FileLength"
-              files=".*/SegmentRoutingManager.java"/>
-    <suppress checks="FileLength"
-              files=".*/Ofdpa2GroupHandler.java"/>
-
-    <!-- Suppressions for yangutils generated code -->
-    <suppress files="org.onosproject.yang.gen.v1.*" checks="Javadoc.*" />
-
-    <suppress files="ApiDocRegistrator.java" checks="JavadocPackage" />
-</suppressions>
diff --git a/apps/olt/.gitignore b/apps/olt/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..0b6585a96413bdfb11558e31d69013aaab482a46
--- /dev/null
+++ b/apps/olt/.gitignore
@@ -0,0 +1,10 @@
+*~
+*.class
+.classpath
+.project
+.settings
+.checkstyle
+target
+*.iml
+.idea
+.DS_Store
diff --git a/apps/olt/.gitreview b/apps/olt/.gitreview
new file mode 100644
index 0000000000000000000000000000000000000000..981cc4c05423058dae74376ec72c0196a1881827
--- /dev/null
+++ b/apps/olt/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.opencord.org
+port=29418
+project=olt.git
+defaultremote=origin
diff --git a/apps/olt/api/bin/.project b/apps/olt/api/bin/.project
deleted file mode 100644
index 148d51aced895bf6f1c61e39e63953b851c06b7a..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>olt-api</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/apps/olt/api/bin/.settings/org.eclipse.core.resources.prefs b/apps/olt/api/bin/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a7844de00dbfc56e6a35d8ed3c022c..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/apps/olt/api/bin/.settings/org.eclipse.jdt.core.prefs b/apps/olt/api/bin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8cb4fc6ce7f061cc9c5b8ad6e554387d63741ba0..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull
-org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=enabled
diff --git a/apps/olt/api/bin/.settings/org.eclipse.m2e.core.prefs b/apps/olt/api/bin/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb2389f85fe6381425d29f0a9866fb65..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/apps/olt/api/bin/pom.xml b/apps/olt/api/bin/pom.xml
deleted file mode 100644
index 2f355a5b0f3bf97ac8d93fe5576ec7d047b3c264..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2021-2023 Open Networking Foundation (ONF) and the ONF Contributors
-  ~
-  ~ 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.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>olt</artifactId>
-        <groupId>org.opencord</groupId>
-        <version>5.2.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <version>${olt.api.version}</version>
-    <artifactId>olt-api</artifactId>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.opencord</groupId>
-            <artifactId>sadis-api</artifactId>
-            <version>${sadis.api.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent$Type.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent$Type.class
deleted file mode 100644
index 7ccaea803b6114b1207fc2036b14a81718090b36..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent$Type.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent.class
deleted file mode 100644
index 2b51c40c7bc78b9b3fb5a0621a1ecbb73b94445b..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceEvent.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceListener.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceListener.class
deleted file mode 100644
index 5f212ed3901c92295665e0a7158f2ee213e403c1..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceListener.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDevicePort.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDevicePort.class
deleted file mode 100644
index 873deab193d4f82839b16ffc151a96a1122e37ae..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDevicePort.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceService.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceService.class
deleted file mode 100644
index 84172a515d8bb67aa6e8ab4b3709169fdfda52aa..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/AccessDeviceService.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber$Status.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber$Status.class
deleted file mode 100644
index 43ccfe3c10a8bbef74ef25fd37e6ca93a606b00a..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber$Status.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber.class
deleted file mode 100644
index 59029bb8907c985fd67dcebcfa28d06596a437e9..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/DiscoveredSubscriber.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowDirection.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowDirection.class
deleted file mode 100644
index fa266fe9f1d76a02f53516ca452db85fea0638a7..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowDirection.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowOperation.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowOperation.class
deleted file mode 100644
index f71f4e1402018b3eea7ac06d70b68982105e04bc..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/FlowOperation.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/MeterData.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/MeterData.class
deleted file mode 100644
index 31077ed9803d0a070827ff59e3b0795c251f172b..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/MeterData.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltDeviceServiceInterface.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/OltDeviceServiceInterface.class
deleted file mode 100644
index c91a4b0f96033004af5f04f0f4ed5fcc864c6be2..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltDeviceServiceInterface.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowServiceInterface.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowServiceInterface.class
deleted file mode 100644
index c0bdc1e4d83d89ea430d7a36430ed022222723af..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowServiceInterface.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowsStatus.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowsStatus.class
deleted file mode 100644
index 29bf759348995354f8895ec0e4b982b46f6ddf06..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltFlowsStatus.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltMeterServiceInterface.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/OltMeterServiceInterface.class
deleted file mode 100644
index c72b2c449ace9cad6169b548553abfbb2569f225..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltMeterServiceInterface.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltPortStatus.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/OltPortStatus.class
deleted file mode 100644
index d81433b973f810645700deb0377f0ce6121e3acd..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/OltPortStatus.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/ServiceKey.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/ServiceKey.class
deleted file mode 100644
index 15b09273f7354a88b850e69c377013037038a147..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/ServiceKey.class and /dev/null differ
diff --git a/apps/olt/api/bin/src/main/java/org/opencord/olt/package-info.class b/apps/olt/api/bin/src/main/java/org/opencord/olt/package-info.class
deleted file mode 100644
index 3d48e05367af55999133d11ad814a6b2a965ee9e..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/src/main/java/org/opencord/olt/package-info.class and /dev/null differ
diff --git a/apps/olt/api/bin/target/checkstyle-cachefile b/apps/olt/api/bin/target/checkstyle-cachefile
deleted file mode 100644
index cd94adc50402a485073ce351629fac297c8e4610..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/checkstyle-cachefile
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Jan 10 12:51:08 UTC 2024
-configuration*?=1545850CB2CE0BBF6C7C4287D9C68C9B7517B241
-/usr/src/olt/api/src/main/java/org/opencord/olt/package-info.java=1704748625336
diff --git a/apps/olt/api/bin/target/checkstyle-checker.xml b/apps/olt/api/bin/target/checkstyle-checker.xml
deleted file mode 100644
index fcad23f064e1e0c019272a994fedd8a4c6d8e751..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/checkstyle-checker.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-
-<!--
-
-  Checkstyle configuration that checks the sun coding conventions from:
-
-    - the Java Language Specification at
-      http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
-    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
-    - the Javadoc guidelines at
-      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
-    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
-    - some best practices
-
-  Checkstyle is very configurable. Be sure to read the documentation at
-  http://checkstyle.sf.net (or in your downloaded distribution).
-
-  Most Checks are configurable, be sure to consult the documentation.
-
-  To completely disable a check, just comment it out or delete it from the file.
-
-  Finally, it is worth reading the documentation.
-
--->
-
-
-<!--
-   The default severity setting in checkstyle is 'error', so some
-   of the rules below are configured to change the severity to
-   'warning'.  Over time, these 'warning' settings should be
-   removed as more of the ONOS source code is modified to
-   follow the recommended rules.
--->
-
-
-<module name="Checker">
-    <!--
-        If you set the basedir property below, then all reported file
-        names will be relative to the specified directory. See
-        http://checkstyle.sourceforge.net/5.x/config.html#Checker
-
-        <property name="basedir" value="${basedir}"/>
-    -->
-    <!-- Checks that a package-info.java file exists for each package.     -->
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#JavadocPackage -->
-    <module name="JavadocPackage"/>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="FileLength"/>
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpSingleline">
-        <property name="format" value="\s+$"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has trailing spaces."/>
-    </module>
-
-    <module name="RegexpMultiline">
-        <property name="format" value="\r\n"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Line has windows line endings."/>
-    </module>
-
-    <!-- Don't allow usage of deprecated Throwables propagate methods -->
-    <module name="RegexpSingleline">
-        <property name="format" value="Throwables.propagate.*\("/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Throwables propagate methods have been deprecated."/>
-    </module>
-
-    <!-- Don't allow usage of Oracle JDK only javafx classes -->
-    <module name="RegexpSingleline">
-        <property name="format" value="javafx.*"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="javafx classes are not supported by all JDKs."/>
-    </module>
-
-    <!-- Don't allow usage of RuntimeException -->
-    <module name="RegexpSingleline">
-        <property name="format" value="throw[ ]*new[ ]*RuntimeException"/>
-        <property name="minimum" value="0"/>
-        <property name="maximum" value="0"/>
-        <property name="message" value="Don't throw generic exception types"/>
-    </module>
-
-    <!-- Checks for Headers                                -->
-    <!-- See http://checkstyle.sf.net/config_header.html   -->
-    <!-- <module name="Header"> -->
-    <!--   <property name="headerFile" value="${checkstyle.header.file}"/> -->
-    <!--   <property name="fileExtensions" value="java"/> -->
-    <!-- </module> -->
-
-    <module name="SuppressWarningsFilter" />
-
-    <module name="SuppressWithPlainTextCommentFilter"/>
-
-    <module name="TreeWalker">
-        <module name="SuppressWarningsHolder" />
-
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat"
-                      value="(CHECKSTYLE\:OFF|Generated by the protocol buffer compiler.)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE:ON"/>
-        </module>
-
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat" value="CHECKSTYLE IGNORE THIS LINE"/>
-            <property name="checkFormat" value=".*"/>
-            <property name="influenceFormat" value="0"/>
-        </module>
-
-        <!-- Example: // CHECKSTYLE IGNORE FinalClass FOR NEXT 1 LINES  -->
-        <module name="SuppressWithNearbyCommentFilter">
-            <property name="commentFormat"
-                      value="CHECKSTYLE IGNORE (\w+) FOR NEXT (\d+) LINES"/>
-            <property name="checkFormat" value="$1"/>
-            <property name="influenceFormat" value="$2"/>
-        </module>
-
-        <!-- Checks for Javadoc comments.                     -->
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-        <module name="JavadocMethod">
-            <property name="scope" value="package"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="JavadocType">
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocVariable">
-            <!-- Suppress check for private member Javadocs.
-             Possibly revist fixing these. -->
-            <property name="scope" value="public"/>
-            <property name="severity" value="ignore"/>
-        </module>
-        <module name="JavadocStyle"/>
-        <!-- @author tag should not be used -->
-        <module name="WriteTag">
-            <property name="tag" value="@author"/>
-            <property name="tagFormat" value="\S"/>
-            <property name="severity" value="ignore"/>
-            <property name="tagSeverity" value="error"/>
-        </module>
-
-        <module name="AbbreviationAsWordInName">
-            <property name="allowedAbbreviationLength" value="2"/>
-        </module>
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName">
-            <!--  ONOS allows the name "log" for static final Loggers -->
-            <property name="format"
-                      value="^log$|^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-
-        <module name="LocalVariableName"/>
-
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-        </module>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport">
-            <property name="allowStaticMemberImports" value="true"/>
-        </module>
-        <module name="IllegalImport"/>
-        <!-- defaults to sun.* packages -->
-        <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
-
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <!-- ONOS standard usage is 80 columns, but we allow up
-             to 120 to not break the build. -->
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^import"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="200"/>
-        </module>
-
-        <module name="ParameterNumber">
-            <property name="max" value="15"/>
-            <property name="tokens" value="CTOR_DEF"/>
-        </module>
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-
-        <!-- Disabled for ONOS.  Default rules specify undesired behavior for the '?' operator -->
-        <!-- <module name="OperatorWrap"/> -->
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-        </module>
-
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-
-        <!--  Disabled for ONOS to allow use of public          -->
-        <!--  modifiers in interfaces.                          -->
-        <!-- <module name="RedundantModifier"/>                 -->
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks">
-            <!-- ONOS alows declarations inside of switch case blocks -->
-            <property name="allowInSwitchCase" value="true"/>
-        </module>
-        <module name="EmptyBlock">
-            <!-- allow empty block, as long as there's some comment -->
-            <property name="option" value="text"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces"/>
-        <module name="RightCurly"/>
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <!-- ONOS allows conditional operators -->
-        <!-- <module name="AvoidInlineConditionals"/> -->
-        <module name="EmptyStatement"/>
-        <module name="EqualsHashCode"/>
-
-        <module name="HiddenField">
-            <property name="ignoreSetter" value="true"/>
-            <property name="ignoreConstructorParameter" value="true"/>
-        </module>
-
-        <module name="IllegalInstantiation"/>
-        <module name="InnerAssignment"/>
-
-        <!-- Many violations of this rule present, revist in a
-        subsequent round of cleanups -->
-        <!-- <module name="MagicNumber"/> -->
-        <module name="MissingSwitchDefault"/>
-
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <!-- ONOS produces many warnings of this type.
-        Fixing all of these is outside the scope of the current cleanup. -->
-        <!-- <module name="DesignForExtension"/> -->
-        <module name="FinalClass"/>
-
-        <module name="HideUtilityClassConstructor"/>
-
-        <module name="InterfaceIsType"/>
-
-        <module name="VisibilityModifier">
-            <property name="severity" value="ignore"/>
-        </module>
-
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-
-        <!--  Many violations of this rule currently, too many to fix
-        in the current cleanup. -->
-        <!-- <module name="FinalParameters"/> -->
-        <!-- ONOS allows TODO markers in checked in source code -->
-        <!-- <module name="TodoComment"/> -->
-        <module name="UpperEll"/>
-    </module>
-
-</module>
diff --git a/apps/olt/api/bin/target/checkstyle-header.txt b/apps/olt/api/bin/target/checkstyle-header.txt
deleted file mode 100644
index 3de16d3a6c1c57389909ec2e8d794ab546d544ae..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/checkstyle-header.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * Copyright 20[1-2][0-9].* Open Networking Foundation
- *
- * Licensed under the Apache License, Version 2.0 \(the "License"\);
diff --git a/apps/olt/api/bin/target/checkstyle-result.xml b/apps/olt/api/bin/target/checkstyle-result.xml
deleted file mode 100644
index 59618dc1d4e495bec546576e70dfb69776b04ff1..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/checkstyle-result.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<checkstyle version="8.10">
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/package-info.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/OltDeviceServiceInterface.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceService.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/ServiceKey.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/OltFlowsStatus.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/OltFlowServiceInterface.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceEvent.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/FlowOperation.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/MeterData.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDevicePort.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/FlowDirection.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceListener.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/OltPortStatus.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/OltMeterServiceInterface.java">
-</file>
-<file name="/usr/src/olt/api/src/main/java/org/opencord/olt/DiscoveredSubscriber.java">
-</file>
-</checkstyle>
diff --git a/apps/olt/api/bin/target/checkstyle-suppressions.xml b/apps/olt/api/bin/target/checkstyle-suppressions.xml
deleted file mode 100644
index c972216a012fdaf705fda39a9a37f7f27126477a..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/checkstyle-suppressions.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2014-present Open Networking Foundation
-  ~
-  ~ 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.
-  -->
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN" "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-
-<suppressions>
-    <suppress files="org.apache.karaf.branding.*" checks="[a-zA-Z0-9]*"/>
-
-    <suppress files=".*" checks="FinalParametersCheck"/>
-    <suppress files=".*" checks="MagicNumbersCheck"/>
-    <suppress files=".*" checks="DesignForExtensionCheck"/>
-    <suppress files=".*" checks="TodoCommentCheck"/>
-    <suppress files=".*" checks="AvoidInlineConditionalsCheck"/>
-    <suppress files=".*" checks="OperatorWrapCheck"/>
-    <suppress files=".*" checks="HiddenField"/>
-    <suppress files=".java" checks="NewlineAtEndOfFile"/>
-    <suppress files="org.onlab.packet.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onlab.jdvue.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.driver.pipeline.ofdpa.Ofdpa2GroupHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.*" checks="AbbreviationAsWordInName" />
-    <suppress files="org.onosproject.segmentrouting.DefaultRoutingHandler.java" checks="FileLength" />
-    <suppress files="org.onosproject.segmentrouting.mcast.McastHandler" checks="FileLength" />
-    <suppress files="org.onosproject.dhcprelay.Dhcp4HandlerImpl" checks="FileLength" />
-
-    <!-- These files carry AT&T copyrights -->
-    <suppress files="org.onlab.packet.EAP" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.EAPOL" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUS" checks="RegexpHeader" />
-    <suppress files="org.onlab.packet.RADIUSAttribute" checks="RegexpHeader" />
-
-    <!-- Suppressions for unit testing code -->
-    <suppress checks="Javadoc(Package|Method)"
-              files=".*/src/test/.*.java"
-            />
-
-    <suppress checks="Javadoc.*"
-              files=".*/thirdparty/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/kafkaintegration/.*.java"/>
-
-    <suppress checks="Javadoc.*"
-              files=".*/demo/.*.java"/>
-
-    <suppress checks="FileLength"
-              files=".*/SegmentRoutingManager.java"/>
-    <suppress checks="FileLength"
-              files=".*/Ofdpa2GroupHandler.java"/>
-
-    <!-- Suppressions for yangutils generated code -->
-    <suppress files="org.onosproject.yang.gen.v1.*" checks="Javadoc.*" />
-
-    <suppress files="ApiDocRegistrator.java" checks="JavadocPackage" />
-</suppressions>
diff --git a/apps/olt/api/bin/target/classes/META-INF/MANIFEST.MF b/apps/olt/api/bin/target/classes/META-INF/MANIFEST.MF
deleted file mode 100644
index 2f081d9a87699d62966b922ebd120dd92ba4e7bd..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/classes/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bnd-LastModified: 1704891067977
-Build-Jdk: 11.0.16
-Built-By: root
-Bundle-Description: OLT Application
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-ManifestVersion: 2
-Bundle-Name: olt-api
-Bundle-SymbolicName: org.opencord.olt-api
-Bundle-Version: 5.2.3
-Created-By: Apache Maven Bundle Plugin
-Export-Package: org.opencord.olt;uses:="org.onlab.packet,org.onosproject
- .core,org.onosproject.event,org.onosproject.net,org.onosproject.net.met
- er,org.opencord.sadis";version="5.2.3"
-Import-Package: org.onlab.packet;version="[2.5,3)",org.onosproject.core;
- version="[2.5,3)",org.onosproject.event;version="[2.5,3)",org.onosproje
- ct.net;version="[2.5,3)",org.onosproject.net.meter;version="[2.5,3)",or
- g.opencord.sadis;version="[5.10,6)"
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
-Tool: Bnd-4.1.0.201810181252
diff --git a/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 1da386fabd6d2f7d9773e63724e94ccaa19ad48c..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-org/opencord/olt/AccessDeviceListener.class
-org/opencord/olt/OltPortStatus.class
-org/opencord/olt/OltFlowsStatus.class
-org/opencord/olt/AccessDeviceEvent$Type.class
-org/opencord/olt/OltFlowServiceInterface.class
-org/opencord/olt/MeterData.class
-org/opencord/olt/OltDeviceServiceInterface.class
-org/opencord/olt/FlowDirection.class
-org/opencord/olt/ServiceKey.class
-org/opencord/olt/FlowOperation.class
-org/opencord/olt/AccessDeviceEvent.class
-org/opencord/olt/DiscoveredSubscriber.class
-org/opencord/olt/AccessDevicePort.class
-org/opencord/olt/OltMeterServiceInterface.class
-org/opencord/olt/DiscoveredSubscriber$Status.class
-org/opencord/olt/AccessDeviceService.class
diff --git a/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 68c5e6be28657e4fbda06b0d1bf971d32ef240f7..0000000000000000000000000000000000000000
--- a/apps/olt/api/bin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,15 +0,0 @@
-/usr/src/olt/api/src/main/java/org/opencord/olt/OltMeterServiceInterface.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/DiscoveredSubscriber.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/OltFlowServiceInterface.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/OltFlowsStatus.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/FlowOperation.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDevicePort.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/OltPortStatus.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceEvent.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/OltDeviceServiceInterface.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceService.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/FlowDirection.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/package-info.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/AccessDeviceListener.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/ServiceKey.java
-/usr/src/olt/api/src/main/java/org/opencord/olt/MeterData.java
diff --git a/apps/olt/api/bin/target/olt-api-5.2.3.jar b/apps/olt/api/bin/target/olt-api-5.2.3.jar
deleted file mode 100644
index b65e6bda22103fea65c41a7722fb77147d0207a6..0000000000000000000000000000000000000000
Binary files a/apps/olt/api/bin/target/olt-api-5.2.3.jar and /dev/null differ
diff --git a/apps/olt/api/pom.xml b/apps/olt/api/pom.xml
index 2f355a5b0f3bf97ac8d93fe5576ec7d047b3c264..7026f182c4d2e6ed45b18154994e1667f1bda327 100644
--- a/apps/olt/api/pom.xml
+++ b/apps/olt/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.2.3</version>
+        <version>5.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/olt/app/pom.xml b/apps/olt/app/pom.xml
index aef2463ce40c9b7ab80b9701ece757c7ae540dab..f6a6d7c23c89d99fcfbfe9f4c8ada90ca5cdfeee 100644
--- a/apps/olt/app/pom.xml
+++ b/apps/olt/app/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.2.3</version>
+        <version>5.2.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opencord</groupId>
     <artifactId>olt-app</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.6</version>
     <packaging>bundle</packaging>
     <description>OLT application for CORD</description>
     <properties>
diff --git a/apps/olt/impl/pom.xml b/apps/olt/impl/pom.xml
index a44d57598c442be23a18ba7bcc3fb3898143dabe..a3acd4eea7c688d96cb48a8d13b713571423d394 100644
--- a/apps/olt/impl/pom.xml
+++ b/apps/olt/impl/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.2.3</version>
+        <version>5.2.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>olt-impl</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.6</version>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
diff --git a/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltDeviceService.java b/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltDeviceService.java
index 1c5c3b4021243a1499af144855d1b501d5217917..fee8a5493cbf815c5f2209d602edf2e9e1e1a4c4 100644
--- a/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltDeviceService.java
+++ b/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltDeviceService.java
@@ -86,19 +86,19 @@ public class OltDeviceService implements OltDeviceServiceInterface {
     private SubscriberAndDeviceInformation getOltInfo(Device dev) {
         if (subsService == null) {
             return null;
-        } else if ((dev.id().toString().contains("device")) || (dev.id().toString().contains("netconf"))) {
+        } else if ((dev.id().toString().contains("device:")) || (dev.id().toString().contains("netconf:"))) {
             return null;
         }
         String devSerialNo = dev.serialNumber();
         return subsService.get(devSerialNo);
     }
 
-
     /**
      * Returns true if the port is an NNI Port on the OLT.
-     * NOTE: We can check if a port is a NNI based on the SADIS config, specifically the uplinkPort section
+     * NOTE: We can check if a port is a NNI based on the SADIS config, specifically
+     * the uplinkPort section
      *
-     * @param dev  the Device this port belongs to
+     * @param dev        the Device this port belongs to
      * @param portNumber the PortNumber to be checked
      * @return boolean
      */
diff --git a/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java b/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
index 7857b48440b7bfbce2373d36508c599a579af2e0..984458bd3df7a1fe372a83f22eace6e252d82dfa 100644
--- a/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
+++ b/apps/olt/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
@@ -105,9 +105,9 @@ public class OltMeterService implements OltMeterServiceInterface {
     protected FlowRuleService flowRuleService;
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL,
-            bind = "bindSadisService",
-            unbind = "unbindSadisService",
-            policy = ReferencePolicy.DYNAMIC)
+                bind = "bindSadisService",
+                unbind = "unbindSadisService",
+                policy = ReferencePolicy.DYNAMIC)
     protected volatile SadisService sadisService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -126,15 +126,15 @@ public class OltMeterService implements OltMeterServiceInterface {
 
     /**
      * Programmed Meters status map.
-     * Keeps track of which meter is programmed on which device for which BandwidthProfile.
+     * Keeps track of which meter is programmed on which device for which
+     * BandwidthProfile.
      * The String key is the BandwidthProfile
      */
     protected Map<DeviceId, Map<String, MeterData>> programmedMeters;
 
     private final MeterListener meterListener = new InternalMeterListener();
-    protected ExecutorService pendingRemovalMetersExecutor =
-            Executors.newFixedThreadPool(5, groupedThreads("onos/olt",
-                                                           "pending-removal-meters-%d", log));
+    protected ExecutorService pendingRemovalMetersExecutor = Executors.newFixedThreadPool(5, groupedThreads("onos/olt",
+            "pending-removal-meters-%d", log));
 
     /**
      * Map that contains a list of meters that needs to be removed.
@@ -196,11 +196,11 @@ public class OltMeterService implements OltMeterServiceInterface {
 
         String zeroCount = get(properties, ZERO_REFERENCE_METER_COUNT);
         int oldSubscriberProcessingThreads = zeroReferenceMeterCount;
-        zeroReferenceMeterCount = isNullOrEmpty(zeroCount) ?
-                oldSubscriberProcessingThreads : Integer.parseInt(zeroCount.trim());
+        zeroReferenceMeterCount = isNullOrEmpty(zeroCount) ? oldSubscriberProcessingThreads
+                : Integer.parseInt(zeroCount.trim());
 
         log.info("Modified. Values = deleteMeters: {}, zeroReferenceMeterCount: {}",
-                 deleteMeters, zeroReferenceMeterCount);
+                deleteMeters, zeroReferenceMeterCount);
     }
 
     @Deactivate
@@ -230,10 +230,13 @@ public class OltMeterService implements OltMeterServiceInterface {
     @Override
     public synchronized boolean createMeter(DeviceId deviceId, String bandwidthProfile) {
 
-        // NOTE it is possible that hasMeterByBandwidthProfile returns false has the meter is in PENDING_ADD
+        // NOTE it is possible that hasMeterByBandwidthProfile returns false has the
+        // meter is in PENDING_ADD
         // then a different thread changes the meter to ADDED
-        // and thus hasPendingMeterByBandwidthProfile return false as well and we install the meter a second time
-        // this causes an inconsistency between the existing meter and meterId stored in the map
+        // and thus hasPendingMeterByBandwidthProfile return false as well and we
+        // install the meter a second time
+        // this causes an inconsistency between the existing meter and meterId stored in
+        // the map
 
         if (!hasMeterByBandwidthProfile(deviceId, bandwidthProfile)) {
             // NOTE this is at trace level as it's constantly called by the queue processor
@@ -246,7 +249,7 @@ public class OltMeterService implements OltMeterServiceInterface {
             }
             if (log.isTraceEnabled()) {
                 log.trace("Meter is not yet available for {} on device {}",
-                          bandwidthProfile, deviceId);
+                        bandwidthProfile, deviceId);
             }
             return false;
         }
@@ -266,7 +269,7 @@ public class OltMeterService implements OltMeterServiceInterface {
 
             if (multicastServiceName.equals(uniTagInfo.getServiceName())) {
                 log.debug("This is the multicast service ({}) for subscriber {} on {}, " +
-                                "meters are not needed",
+                        "meters are not needed",
                         uniTagInfo.getServiceName(), si.id(), deviceId);
                 return;
             }
@@ -296,8 +299,8 @@ public class OltMeterService implements OltMeterServiceInterface {
         if (waitingOnMeter.get()) {
             if (log.isTraceEnabled()) {
                 log.trace("Meters {} on device {} are not " +
-                                  "installed yet (requested by subscriber {})",
-                          pendingMeters, deviceId, si.id());
+                        "installed yet (requested by subscriber {})",
+                        pendingMeters, deviceId, si.id());
             }
             return false;
         }
@@ -305,7 +308,8 @@ public class OltMeterService implements OltMeterServiceInterface {
     }
 
     /**
-     * Returns true if a meter is present in the programmed meters map, only if status is ADDED.
+     * Returns true if a meter is present in the programmed meters map, only if
+     * status is ADDED.
      *
      * @param deviceId         the DeviceId on which to look for the meter
      * @param bandwidthProfile the Bandwidth profile associated with this meter
@@ -338,14 +342,15 @@ public class OltMeterService implements OltMeterServiceInterface {
             if (log.isTraceEnabled()) {
                 log.trace("pending metersOnDevice {}: {}", deviceId, metersOnDevice);
             }
-            // NOTE that we check in order if the meter was ADDED and if it wasn't we check for PENDING_ADD
+            // NOTE that we check in order if the meter was ADDED and if it wasn't we check
+            // for PENDING_ADD
             // it is possible that a different thread move the meter state from PENDING_ADD
             // to ADDED between these two checks
-            // to avoid creating the meter twice we return true event if the meter is already added
-            return metersOnDevice.get(bandwidthProfile) != null && (
-                    metersOnDevice.get(bandwidthProfile).getMeterStatus().equals(MeterState.ADDED) ||
-                            metersOnDevice.get(bandwidthProfile).getMeterStatus().equals(MeterState.PENDING_ADD)
-            );
+            // to avoid creating the meter twice we return true event if the meter is
+            // already added
+            return metersOnDevice.get(bandwidthProfile) != null
+                    && (metersOnDevice.get(bandwidthProfile).getMeterStatus().equals(MeterState.ADDED) ||
+                            metersOnDevice.get(bandwidthProfile).getMeterStatus().equals(MeterState.PENDING_ADD));
 
         } finally {
             programmedMeterReadLock.unlock();
@@ -411,8 +416,7 @@ public class OltMeterService implements OltMeterServiceInterface {
                 MeterData meterData = new MeterData(
                         null,
                         MeterState.PENDING_ADD,
-                        bandwidthProfile
-                );
+                        bandwidthProfile);
                 deviceMeters.put(bandwidthProfile, meterData);
 
                 return deviceMeters;
@@ -446,14 +450,14 @@ public class OltMeterService implements OltMeterServiceInterface {
                         @Override
                         public void onSuccess(MeterRequest op) {
                             log.info("Meter for BandwidthProfile {} is installed on the device {}",
-                                     bandwidthProfile, deviceId);
+                                    bandwidthProfile, deviceId);
                             meterFuture.complete(null);
                         }
 
                         @Override
                         public void onError(MeterRequest op, MeterFailReason reason) {
                             log.error("Failed installing meter on {} for {}",
-                                      deviceId, bandwidthProfile);
+                                    deviceId, bandwidthProfile);
                             meterFuture.complete(reason);
                         }
                     })
@@ -501,7 +505,7 @@ public class OltMeterService implements OltMeterServiceInterface {
         // add cir
         if (bpInfo.committedInformationRate() != 0) {
             meterBands.add(createMeterBand(bpInfo.committedInformationRate(),
-                                           bpInfo.committedBurstSize(), Band.Type.DROP, null));
+                    bpInfo.committedBurstSize(), Band.Type.DROP, null));
         }
 
         // check if both air and gir are set together in sadis
@@ -511,18 +515,20 @@ public class OltMeterService implements OltMeterServiceInterface {
         }
 
         // add pir
-        long pir = bpInfo.peakInformationRate() != 0 ? bpInfo.peakInformationRate() : (bpInfo.exceededInformationRate()
-                + bpInfo.committedInformationRate() + bpInfo.guaranteedInformationRate()
-                + bpInfo.assuredInformationRate());
+        long pir = bpInfo.peakInformationRate() != 0 ? bpInfo.peakInformationRate()
+                : (bpInfo.exceededInformationRate()
+                        + bpInfo.committedInformationRate() + bpInfo.guaranteedInformationRate()
+                        + bpInfo.assuredInformationRate());
 
-        Long pbs = bpInfo.peakBurstSize() != null ? bpInfo.peakBurstSize() :
-                (bpInfo.exceededBurstSize() != null ? bpInfo.exceededBurstSize() : 0) +
+        Long pbs = bpInfo.peakBurstSize() != null ? bpInfo.peakBurstSize()
+                : (bpInfo.exceededBurstSize() != null ? bpInfo.exceededBurstSize() : 0) +
                         (bpInfo.committedBurstSize() != null ? bpInfo.committedBurstSize() : 0);
 
         meterBands.add(createMeterBand(pir, pbs, Band.Type.REMARK, (short) 1));
 
         // add gir
-        //We can use DROP here because it GIr will never be equals to cir so rate will always be different.
+        // We can use DROP here because it GIr will never be equals to cir so rate will
+        // always be different.
         if (bpInfo.guaranteedInformationRate() != 0) {
             meterBands.add(createMeterBand(bpInfo.guaranteedInformationRate(), 0L, Band.Type.DROP, null));
         }
@@ -541,7 +547,7 @@ public class OltMeterService implements OltMeterServiceInterface {
 
     private Band createMeterBand(long rate, Long burst, Band.Type type, Short precedence) {
         Band.Builder bandBuilder = DefaultBand.builder()
-                .withRate(rate) //already Kbps
+                .withRate(rate) // already Kbps
                 .burstSize(burst) // already Kbits
                 .ofType(type); // no matter
         if (precedence != null) {
@@ -592,8 +598,8 @@ public class OltMeterService implements OltMeterServiceInterface {
                         return;
                     }
                     log.info("Zero Count Reference event is received for meter {} on {}, " +
-                                     "incrementing counter",
-                             meter.id(), meter.deviceId());
+                            "incrementing counter",
+                            meter.id(), meter.deviceId());
                     incrementMeterCount(meter.deviceId(), key);
                     if (pendingRemoveMeters.get(meter.deviceId())
                             .get(key).get() >= zeroReferenceMeterCount) {
@@ -630,17 +636,18 @@ public class OltMeterService implements OltMeterServiceInterface {
                     .map(Identifier::id)
                     .anyMatch(meterId::equals);
         }
+
         private void removeMeterCount(Meter meter, MeterKey key) {
             pendingRemoveMeters.computeIfPresent(meter.deviceId(),
-                                                 (id, meters) -> {
-                                                     if (meters.get(key) == null) {
-                                                         log.info("Meters is not pending " +
-                                                                          "{} on {}", key, id);
-                                                         return meters;
-                                                     }
-                                                     meters.remove(key);
-                                                     return meters;
-                                                 });
+                    (id, meters) -> {
+                        if (meters.get(key) == null) {
+                            log.info("Meters is not pending " +
+                                    "{} on {}", key, id);
+                            return meters;
+                        }
+                        meters.remove(key);
+                        return meters;
+                    });
         }
 
         private void incrementMeterCount(DeviceId deviceId, MeterKey key) {
@@ -648,17 +655,17 @@ public class OltMeterService implements OltMeterServiceInterface {
                 return;
             }
             pendingRemoveMeters.compute(deviceId,
-                                        (id, meters) -> {
-                                            if (meters == null) {
-                                                meters = new HashMap<>();
-
-                                            }
-                                            if (meters.get(key) == null) {
-                                                meters.put(key, new AtomicInteger(1));
-                                            }
-                                            meters.get(key).addAndGet(1);
-                                            return meters;
-                                        });
+                    (id, meters) -> {
+                        if (meters == null) {
+                            meters = new HashMap<>();
+
+                        }
+                        if (meters.get(key) == null) {
+                            meters.put(key, new AtomicInteger(1));
+                        }
+                        meters.get(key).addAndGet(1);
+                        return meters;
+                    });
         }
     }
 
diff --git a/apps/olt/pom.xml b/apps/olt/pom.xml
index 487af2295deebbb7055da916de46bf313b98f885..23866049d78b03c115bfd66120842071295fc80f 100644
--- a/apps/olt/pom.xml
+++ b/apps/olt/pom.xml
@@ -26,17 +26,17 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
     <groupId>org.opencord</groupId>
     <artifactId>olt</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.6</version>
     <packaging>pom</packaging>
     <description>OLT Application</description>
     <url>http://onosproject.org</url>
     <properties>
-        <sadis.api.version>5.10.0</sadis.api.version>
-        <olt.api.version>5.2.3</olt.api.version>
+        <sadis.api.version>5.12.2</sadis.api.version>
+        <olt.api.version>5.2.6</olt.api.version>
     </properties>
     <dependencies>
         <dependency>
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <version>4.0.4</version>
+                <version>4.7.3.4</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -77,7 +77,7 @@
                         <plugin>
                             <groupId>com.h3xstream.findsecbugs</groupId>
                             <artifactId>findsecbugs-plugin</artifactId>
-                            <version>1.10.1</version>
+                            <version>1.12.0</version>
                         </plugin>
                     </plugins>
                 </configuration>
diff --git a/apps/olt/web/pom.xml b/apps/olt/web/pom.xml
index f1c27e9e80dde295bc4167e54e1ec75aa4585203..e003cb8ded43d6588167aeb805125a95725b8a26 100644
--- a/apps/olt/web/pom.xml
+++ b/apps/olt/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.2.3</version>
+        <version>5.2.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>olt-web</artifactId>
diff --git a/apps/sonic-onos-driver/pipeliner/deps/pi-3.0.0-SNAPSHOT.jar b/apps/sonic-onos-driver/pipeliner/deps/pi-3.0.0-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..04dccd45c0b63f4ea499dcf73141987de46042bb
Binary files /dev/null and b/apps/sonic-onos-driver/pipeliner/deps/pi-3.0.0-SNAPSHOT.jar differ
diff --git a/apps/sonic-onos-driver/pipeliner/pom.xml b/apps/sonic-onos-driver/pipeliner/pom.xml
index 7b4a5b0b38c4c82e94365a23b9cb03c792c95c6d..d5b76a2def1081b2ce2cc6e826747febe54f0f96 100644
--- a/apps/sonic-onos-driver/pipeliner/pom.xml
+++ b/apps/sonic-onos-driver/pipeliner/pom.xml
@@ -11,8 +11,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>2.5.9-ORANBR</version>
-        <relativePath>../onos-dependencies.xml</relativePath>
+        <version>2.5.8-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onosproject.pipelines</groupId>
@@ -72,6 +71,14 @@
             <version>${onos.version}</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>pi</artifactId>
+            <version>${onos.version}</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/deps/pi-3.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <repositories>
diff --git a/assets/images/.gitkeep b/assets/images/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/assets/images/image-1.png b/assets/images/image-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..195b657307656e1b8a7da73e161fff22ed37fa39
Binary files /dev/null and b/assets/images/image-1.png differ
diff --git a/assets/images/image-2.png b/assets/images/image-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f2ceaceac6112ea72cbf7cc8668a80468331b0a
Binary files /dev/null and b/assets/images/image-2.png differ
diff --git a/assets/images/image-3-1.png b/assets/images/image-3-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3605f48e37cf1651c8a75af13ac64412ea14c7c
Binary files /dev/null and b/assets/images/image-3-1.png differ
diff --git a/assets/images/image-3-2.png b/assets/images/image-3-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..e31868528891f7c758fd4f8494028c74ff927fce
Binary files /dev/null and b/assets/images/image-3-2.png differ
diff --git a/assets/images/image-4.png b/assets/images/image-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e4612ea44c31e83174fb948adf102ad9ef900df
Binary files /dev/null and b/assets/images/image-4.png differ
diff --git a/config/k8s/onos/config-voltha.yaml b/config/k8s/onos/config-voltha.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e50be7451ecaef44a15e8bac5de6c1bc69f1dcbe
--- /dev/null
+++ b/config/k8s/onos/config-voltha.yaml
@@ -0,0 +1,154 @@
+nameOverride: ""
+image:
+  repository: muriloavlis/oran-onos
+  tag: v3.0.0-dev
+  pullPolicy: Always
+  pullSecrets: []
+
+replicas: 1
+
+podAntiAffinity:
+  enabled: false
+
+heap: 4G
+
+apps:
+    - org.onosproject.lldpprovider
+    - org.onosproject.openflow-base
+    - org.onosproject.gui2
+    - org.onosproject.drivers
+    - org.onosproject.mcast
+    - org.onosproject.segmentrouting
+    - org.opencord.kafka
+    - org.opencord.sadis
+    - org.opencord.dhcpl2relay
+    - org.opencord.igmpproxy
+    - org.opencord.mcast
+    - org.opencord.olt
+    - org.opencord.aaa
+    - org.opencord.bng
+    - org.opencord.maclearner
+    - org.opencord.olttopology
+    - org.opencord.pppoeagent
+    - org.onosproject.netcfghostprovider
+    - org.onosproject.hostprovider
+
+java_opts: >
+  -XX:+UseG1GC
+  -XX:MaxGCPauseMillis=200
+  -XX:-UseContainerSupport
+  -Dkaraf.log.console=INFO
+  -Dds.lock.timeout.milliseconds=10000
+  -Dlog4j2.formatMsgNoLookups=true
+
+probe_timeout: 150
+
+atomix:
+  image:
+    tag: 3.1.12
+  replicas: 1
+  podAntiAffinity:
+    enabled: false
+  persistence:
+    enabled: true # mudar para "false" caso não tiver um storageClass
+    storageClass: openebs-hostpath
+  java_opts: >
+    -Xmx2G
+    -XX:-UseContainerSupport
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 3
+
+resources:
+  requests:
+    cpu: 0.5
+    memory: 1Gi
+
+config:
+  enabled: true
+  reconcile_mode: false
+  netcfg: >
+    {
+      "apps": {
+        "org.opencord.dhcpl2relay": {
+          "dhcpl2relay": {
+            "useOltUplinkForServerPktInOut": true
+          }
+        },
+        "org.opencord.kafka": {
+          "kafka": {
+            "bootstrapServers": "voltha-infra-kafka.infra.svc:9092"
+          }
+        },
+        "org.opencord.aaa": {
+          "AAA": {
+            "radiusConnectionType": "socket",
+            "radiusHost": "voltha-infra-freeradius.infra.svc",
+            "radiusServerPort": "1812",
+            "radiusSecret": "SECRET"
+          }
+        },
+        "org.opencord.sadis": {
+          "sadis": {
+            "integration": {
+              "url": "http://bbsim-sadis-server.infra.svc:58080/subscribers/%s",
+              "cache": {
+                "enabled": true,
+                "maxsize": 50,
+                "ttl": "PT1m"
+              }
+            }
+          },
+          "bandwidthprofile": {
+            "integration": {
+              "url": "http://bbsim-sadis-server.infra.svc:58080/profiles/%s",
+              "cache": {
+                "enabled": true,
+                "maxsize": 50,
+                "ttl": "PT1m"
+              }
+            }
+          }
+        }
+      }
+    }
+  componentConfig:
+    "org.opencord.olt.impl.OltFlowService": >
+      {
+        "enableDhcpOnNni": "true",
+        "defaultTechProfileId": "64",
+        "enableIgmpOnNni": "false",
+        "enableEapol": "true",
+        "enableDhcpV6": "false",
+        "enableDhcpV4": "true"
+      }
+    "org.onosproject.provider.lldp.impl.LldpLinkProvider": >
+      {
+        "enabled": "false"
+      }
+    "org.onosproject.net.flow.impl.FlowRuleManager": >
+      {
+        "purgeOnDisconnection": "false"
+      }
+    "org.onosproject.net.meter.impl.MeterManager": >
+      {
+        "purgeOnDisconnection": "false",
+      }
+    "org.onosproject.net.group.impl.GroupManager": >
+      {
+        "purgeOnDisconnection": "false"
+      }
+    "org.onosproject.net.device.impl.DeviceManager": >
+      {
+        "roleTimeoutSeconds": "120"
+      }
+      
+ports:
+  - name: east-west
+    port: 9876
+  - name: cli
+    port: 8101
+  - name: ui
+    port: 8181
\ No newline at end of file
diff --git a/config/k8s/voltha/stackConnectOnos.yaml b/config/k8s/voltha/stackConnectOnos.yaml
index a461b1c7efb8f244d54bb6598dfc8ec41438a1c0..4fe5f97308c1caadbc88cb662ed009942114df90 100644
--- a/config/k8s/voltha/stackConnectOnos.yaml
+++ b/config/k8s/voltha/stackConnectOnos.yaml
@@ -3,4 +3,4 @@ voltha:
       replicas: 1
    services:
       controller:
-        - address: onos-classic-onos-classic-0.onos-classic-onos-classic-hs.controller.svc:6653
\ No newline at end of file
+        - address: onos-classic-onos-classic-0.onos-classic-onos-classic-hs.sdpon-controller.svc:6653
\ No newline at end of file
diff --git a/docs/onosInstall.md b/docs/onosInstall.md
index 33f6c323b1139860d9167d28377a6ec5cff5946b..94126515108e5ab4c572aa415582c269751fbbdd 100644
--- a/docs/onosInstall.md
+++ b/docs/onosInstall.md
@@ -32,6 +32,18 @@ helm install -n controller onos-classic onosproject/onos-classic -f config.yaml
 
 With this, we'll have the ONOS Classic installed on the namespace controller of the K8s Cluster.
 
+### Install ONOS Classic for voltha
+
+With the ONOS Project repository added on Helm, the ONOS Classic can be installed on K8s cluster, as shown in the command below.
+
+```bash
+helm install -n sdpon-controller onos-classic onosproject/onos-classic -f config-voltha.yaml --create-namespace
+
+```
+### Install ONOS Classic for P4/ODTN
+
+TODO
+
 ### Expose ONOS Classic Services via NodePort
 
 By default, ONOS Classic installation creates only one cluster IP type service. To expose ONOS Classic ports, a NodePort type service can be used.
diff --git a/docs/onosUserCreate.md b/docs/onosUserCreate.md
new file mode 100644
index 0000000000000000000000000000000000000000..52f96a02ccc79ee9cc3022a308eed048206ebb5c
--- /dev/null
+++ b/docs/onosUserCreate.md
@@ -0,0 +1,129 @@
+# Criação de usuários ONOS Classic
+
+A CLI do ONOS é uma extensão da CLI do Karaf, desse modo, é possível utilizar como base as medidas de segurança baseada em RBAC (Role Based Access Control) provida pelo JAAS (Java Authentication and Authorization Service).
+
+## Acesso ao ONOS
+
+Para acessar a CLI do ONOS caso esteja instaciado no Kubernetes utilizamos o seguinte comando:
+
+> **_Note_**: a porta tradicional da CLI no ONOS é a 8101, porém no Kubernetes dependendo de como ela foi exposta pode variar, sendo assim, é necessário verificar seu serviço no cluster.
+
+```bash
+## verificar o serviço e a porta
+## namespace-onos pode variar
+
+kubectl get services -n namespace-onos
+```
+
+Após verificar a porta podemos acessar a CLI do ONOS:
+
+```bash
+## acessar a cli via ssh
+
+ssh -p porta-serviço-onos usuário-onos@ip-cluster
+```
+
+Onde temos:
+
+- porta-serviço-onos: é a porta exposta no cluster.
+- usuário-onos: podemos utilizar os padrões onos e karaf.
+- ip-cluster: ip do cluster kubernetes que o onos está.
+
+![ONOS CLI access](../assets/images/image-1.png)
+
+## Realms
+
+O Karaf utiliza o conceito de diferentes "realms", onde cada realm diferente tem sua definição de como utiliza o módulo de login para autenticação e/ou autorização.
+
+```bash
+## É possível verificar os tipos de realm com o comando
+
+jaas:realm-list
+```
+
+> **_Note_**: Existem 4 realms diferentes, nesse tutorial trataremos do primeiro, mas é possível ver na documentação base e na descrição que é retornada no comando realm-list.
+
+O Realm de index 1, PropertiesLoginModule, usa o arquivo etc/users.properties como backend para usuários, grupos, funções e senha. Este módulo de login autentica os usuários e retorna as funções dos usuários.
+
+## Criar usuário
+
+Para interagir com os usuários primeiro é necessário definir que estamos utilizando algum realm.
+
+```bash
+## Definir o realm a ser utilizado
+
+jaas:realm-manage --index 1
+```
+
+É possível ver o usuários presentes no onos utilizando o comando:
+
+```bash
+## listar usuários, grupo e role
+
+jaas:user-list
+```
+
+![ONOS users list](../assets/images/image-2.png)
+
+
+Com isso, podemos criar usuários utilizando o comando:
+
+```bash
+## Comando para criar usuários.
+
+jaas:user-add usuário senha
+```
+
+Após isso, para que seja realizada a consolidação da ação anterior devemos utilizar o comando de atualização:
+
+```bash
+## O comando update realiza a consolidação das alterações feitas 
+
+jaas:update
+```
+
+Para verificar se o usuário foi criado podemos usar os comandos:
+
+```bash
+## Após utilizar o comando de update ou cancel é necessário definir novamente o realm utilizado
+
+jaas:realm-manage --index 1
+jaas:user-list
+```
+
+![ONOS users list att](../assets/images/image-3-1.png)
+
+Para deletar o usuário seguimos o padrão:
+
+```bash
+
+jaas:realm-manage --index 1
+jaas:user-list
+jaas:user-delete usuário
+jaas:update
+```
+> **_Note_**: Não excluir os usuários ONOS e KARAF, eles são utilizados para verificação de estado no Kubernetes, caso eles sejam excluídos o seu POD será reiniciado, o mesmo vale para alteração das suas senhas.
+
+## Atribuir o usuário para um grupo
+
+Após criar o usuário devemos o atribuir para um respectivo grupo, no ONOS temos apenas 2 por padrão (admingroup e guestgroup).
+
+![ONOS groups](../assets/images/image-3-2.png)
+
+> **_Note_**: É possível criar outros grupos, verificar a documentação do karaf.
+
+```bash
+## Após utilizar o comando de update ou cancel é necessário definir novamente o realm utilizado
+
+jaas:realm-manage --index 1 #Sempre verificar se estamos utilizando o realm correto
+jaas:user-list #verificar o usuário desejado
+jaas:group-add usuário mygroup 
+```
+
+![ONOS user group](../assets/images/image-4.png)
+
+Com isso temos nosso usuário em seu respectivo grupo com suas permissões em forma de role.
+
+## Outras opções
+
+[A documentação do Karaf](https://karaf.apache.org/manual/latest/security#_security) detalha outras formas de criar usuários, a exemplo de encriptação das senhas, como utilizar a autenticação via chave, RBAC e etc.
\ No newline at end of file
diff --git a/docs/volthaInstall.md b/docs/volthaInstall.md
index 1165c4a411556912af60b3f30d5bd30310da131c..5eb23d2c3725f97200577d53d3485b617c0c1e02 100644
--- a/docs/volthaInstall.md
+++ b/docs/volthaInstall.md
@@ -8,6 +8,10 @@
 - 12 GB RAM or more;
 - 8 CPUs or more;
 
+
+helm install -n sdpon-controller onos-classic onosproject/onos-classic -f config-voltha.yaml --create-namespace
+
+
 ## Volha Installation
 
 ### Add repositories
@@ -24,18 +28,13 @@ helm repo update
 With the Open CORD repository added on Helm, the voltha-infra can be installed on K8s cluster, as shown in the command below.
 
 ```bash
-helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra  --set onos-classic.enabled=false --set onos-classic.config.enabled=false --set voltha-tracing.enabled=true --set efk.enabled=true
+helm upgrade --install --create-namespace -n infra voltha-infra onf/voltha-infra  --set onos-classic.enabled=false --set onos-classic.config.enabled=false --set voltha-tracing.enabled=true --set efk.enabled=true --set voltha-tracing.tracing.image.tag=1.51
 ```
 
 #### Send configuration to ONOS Classic on controller namespace
 
-After to install voltha-infra on K8s Cluster, it's necessary to send the infra infomations to ONOS Classic. For this, you may use the following command.
-
-```bash
-curl -sSL --user karaf:karaf --noproxy localhost -X POST -H 'Content-Type:application/json' http://localhost:30081/onos/v1/network/configuration/ -d@onosConnectInfra.json
-```
+Now the configuration of the connection of onos and voltha-infra is in the config-voltha.yaml wich is used in the deployment of controller, so there is no need to pass this configuration- check the tutorial of the [onos classic deployment](/docs/onosInstall.md).
 
-> **_Note_**: The onosConnectInfra.json file model is here: [onosConnectInfra.yaml](/config/netcfgModels/voltha/onosConnectInfra.json). For installation changes modify this file.
 
 ### Install Voltha Stack
 
@@ -45,7 +44,7 @@ The Voltha Stack connects to the ONOS Classic service on the K8s. For this, a ya
 helm upgrade --install --create-namespace -n voltha voltha onf/voltha-stack --set global.stack_name=voltha --set global.voltha_infra_name=voltha-infra --set global.voltha_infra_namespace=infra --set global.tracing.enabled=true --set global.log_correlation.enabled=true -f stackConnectOnos.yaml
 ```
 
-> **_Note_**: The stackConnectOnos.yaml file model is here: [stackConnectOnos.yaml](/config/k8s/voltha/stackConnectOnos.yaml). For installation changes modify this file.
+> **_Note_**: The stackConnectOnos.yaml file model is here: [stackConnectOnos.yaml](/config/k8s/voltha/stackConnectOnos.yaml). For installation changes modify this file (the namespaces).
 
 #### Expose Voltha API Service
 
diff --git a/scripts/app-build.sh b/scripts/app-build.sh
index f821b74094683191f1d795af0a356b51deee10f4..f1f75b0eedb947a29d9714d68c09d30818e97137 100755
--- a/scripts/app-build.sh
+++ b/scripts/app-build.sh
@@ -97,10 +97,8 @@ function build_app_local { # Function to build an app with local dir
 }
 
 function aaa-build {
-	build_app "${AAA_ROOT}"/app/target \
-	"${AAA_ROOT}"/ "aaa" \
-	"${AAA_ARTIFACT}" "${AAA_VERSION}" \
-	"app/target" "${AAA_OAR}"
+	build_app_local "${AAA_ROOT}"/app/target \
+	"${AAA_ROOT}"/ "aaa"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${AAA_ROOT}"
 		AAA_OAR="${AAA_ROOT}"/app/target/"${AAA_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -109,22 +107,19 @@ function aaa-build {
 }
 
 function bng-build {
-	build_app "${BNG_ROOT}"/app/target \
-	"${BNG_ROOT}"/ "bng" \
-	"${BNG_ARTIFACT}" "${BNG_VERSION}" \
-	"app/target" "${BNG_OAR}"
+	build_app_local "${BNG_ROOT}"/app/target \
+	"${BNG_ROOT}"/ "bng"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${BNG_ROOT}"
-		BNG_OAR="${BNG_ROOT}"/app/target/"${BNG_ARTIFACT}"-"${PROJECT_VERSION}".oar
+		BNG_OAR="${BNG_ROOT}"/app/target/"${BNG_ARTIFACTID}"-"${PROJECT_VERSION}".oar
 	fi
 	cp "${BNG_OAR}" "${LOCAL_APPS}"/
 }
 
 function dhcpl2relay-build {
-	build_app "${DHCPL2RELAY_ROOT}"/app/target \
-	"${DHCPL2RELAY_ROOT}"/ "dhcpl2relay" \
-	"${DHCPL2RELAY_ARTIFACT}" "${DHCPL2RELAY_VERSION}" \
-	"app/target" "${DHCPL2RELAY_OAR}"
+	build_app_local "${DHCPL2RELAY_ROOT}"/app/target \
+	"${DHCPL2RELAY_ROOT}"/ "dhcpl2relay" 
+
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${DHCPL2RELAY_ROOT}"
 		DHCPL2RELAY_OAR="${DHCPL2RELAY_ROOT}"/app/target/"${DHCPL2RELAY_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -143,10 +138,9 @@ function igmpproxy-build {
 }
 
 function kafka-onos-build {
-	build_app "${KAFKA_ROOT}"/app/target \
-	"${KAFKA_ROOT}"/ "kafka-onos" \
-	"${KAFKA_ARTIFACT}" "${KAFKA_VERSION}" \
-	"app/target" "${KAFKA_OAR}"
+	build_app_local "${KAFKA_ROOT}"/app/target \
+	"${KAFKA_ROOT}"/ "kafka-onos"
+	
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${KAFKA_ROOT}"
 		KAFKA_OAR="${KAFKA_ROOT}"/target/"${KAFKA_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -155,10 +149,9 @@ function kafka-onos-build {
 }
 
 function mac-learning-build {
-	build_app "${MAC_LEARNING_ROOT}"/app/target \
-	"${MAC_LEARNING_ROOT}"/ "mac-learning" \
-	"${MAC_LEARNING_ARTIFACT}" "${MAC_LEARNING_VERSION}" \
-	"app/target" "${MAC_LEARNING_OAR}"
+	build_app_local "${MAC_LEARNING_ROOT}"/app/target \
+	"${MAC_LEARNING_ROOT}"/ "mac-learning" 
+
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${MAC_LEARNING_ROOT}"
 		MAC_LEARNING_OAR="${MAC_LEARNING_ROOT}"/app/target/"${MAC_LEARNING_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -167,10 +160,9 @@ function mac-learning-build {
 }
 
 function mcast-build {
-	build_app "${MCAST_ROOT}"/app/target \
-	"${MCAST_ROOT}"/ "mcast" \
-	"${MCAST_ARTIFACT}" "${MCAST_VERSION}" \
-	"app/target" "${MCAST_OAR}"
+	build_app_local "${MCAST_ROOT}"/app/target \
+	"${MCAST_ROOT}"/ "mcast" 
+
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${MCAST_ROOT}"
 		MCAST_OAR="${MCAST_ROOT}"/app/target/"${MCAST_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -180,7 +172,7 @@ function mcast-build {
 
 function olt-build {
 	build_app_local "${OLT_ROOT}"/app/target \
-	"${OLT_ROOT}"/ "olt" 
+	"${OLT_ROOT}"/ "olt"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${OLT_ROOT}"
 		OLT_OAR="${OLT_ROOT}"/app/target/"${OLT_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -189,34 +181,48 @@ function olt-build {
 }
 
 function olttopology-build {
-	build_app "${OLTTOPOLOGY_ROOT}"/app/target \
-	"${OLTTOPOLOGY_ROOT}"/ "olttopology" \
-	"${OLTTOPOLOGY_ARTIFACT}" "${OLTTOPOLOGY_VERSION}" \
-	"app/target" "${OLTTOPOLOGY_OAR}"
+	build_app_local "${OLTTOPOLOGY_ROOT}"/app/target \
+	"${OLTTOPOLOGY_ROOT}"/ "olttopology"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${OLTTOPOLOGY_ROOT}"
-		OLTTOPOLOGY_OAR="${OLTTOPOLOGY_ROOT}"/app/target/"${OLTTOPOLOGY_ARTIFACT}"-"${PROJECT_VERSION}".oar
+		OLTTOPOLOGY_OAR="${OLTTOPOLOGY_ROOT}"/app/target/"${OLTTOPOLOGY_ARTIFACTID}"-"${PROJECT_VERSION}".oar
 	fi
 	cp "${OLTTOPOLOGY_OAR}" "${LOCAL_APPS}"/
 }
 
 function pppoeagent-build {
-	build_app "${PPPOEAGENT_ROOT}"/app/target \
-	"${PPPOEAGENT_ROOT}"/ "pppoeagent" \
-	"${PPPOEAGENT_ARTIFACT}" "${PPPOEAGENT_VERSION}" \
-	"app/target" "${PPPOEAGENT_OAR}"
+	build_app_local "${PPPOEAGENT_ROOT}"/app/target \
+	"${PPPOEAGENT_ROOT}"/ "pppoeagent"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${PPPOEAGENT_ROOT}"
-		PPPOEAGENT_OAR="${PPPOEAGENT_ROOT}"/app/target/"${PPPOEAGENT_ARTIFACT}"-"${PROJECT_VERSION}".oar
+		PPPOEAGENT_OAR="${PPPOEAGENT_ROOT}"/app/target/"${PPPOEAGENT_ARTIFACTID}"-"${PROJECT_VERSION}".oar
 	fi
 	cp "${PPPOEAGENT_OAR}" "${LOCAL_APPS}"/
 }
 
+function sonic-onos-driver-build {
+	build_app_local "${SONIC_DRIVER_ROOT}"/target \
+	"${SONIC_DRIVER_ROOT}"/ "driver" 
+	if [ "$MVN" -eq "0" ]; then
+		extract_version "${SONIC_DRIVER_ROOT}"
+		SONIC_DRIVER_OAR="${SONIC_DRIVER_ROOT}"/target/"${SONIC_DRIVER_ARTIFACTID}"-"${PROJECT_VERSION}".oar
+	fi
+	cp "${SONIC_DRIVER_OAR}" "${LOCAL_APPS}"/
+}
+
+function sonic-onos-pipeliner-build {
+	build_app_local "${SONIC_PIPELINER_ROOT}"/target \
+	"${SONIC_PIPELINER_ROOT}"/ "pipeliner" 
+	if [ "$MVN" -eq "0" ]; then
+		extract_version "${SONIC_PIPELINER_ROOT}"
+		SONIC_PIPELINE_OAR="${SONIC_PIPELINER_ROOT}"/target/"${SONIC_PIPELINER_ARTIFACTID}"-"${PROJECT_VERSION}".oar
+	fi
+	cp "${SONIC_PIPELINER_OAR}" "${LOCAL_APPS}"/
+}
+
 function sadis-build {
-	build_app "${SADIS_ROOT}"/app/target \
-	"${SADIS_ROOT}"/ "sadis" \
-	"${SADIS_ARTIFACT}" "${SADIS_VERSION}" \
-	"app/target" "${SADIS_OAR}"
+	build_app_local "${SADIS_ROOT}"/app/target \
+	"${SADIS_ROOT}"/ "sadis"
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${SADIS_ROOT}"
 		SADIS_OAR="${SADIS_ROOT}"/app/target/"${SADIS_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -230,6 +236,7 @@ function trellis-control-build {
 	"${TRELLIS_CONTROL_ROOT}"/ "trellis-control" \
 	"${TRELLIS_CONTROL_ARTIFACT}" "${TRELLIS_CONTROL_VERSION}" \
 	"app/target" "${TRELLIS_CONTROL_OAR}" "${TRELLIS_CONTROL_REPO}"
+
 	# If MVN was not successful - built from sources
 	if [ "$MVN" -eq "0" ]; then
 		# When building from source api and app jars are automatically put into the local .m2 folder.
@@ -255,6 +262,7 @@ function trellis-t3-build {
 	"${TRELLIS_T3_ROOT}"/ "trellis-t3" \
 	"${TRELLIS_T3_ARTIFACT}" "${TRELLIS_T3_VERSION}" \
 	"app/target" "${TRELLIS_T3_OAR}" "${TRELLIS_T3_REPO}"
+
 	if [ "$MVN" -eq "0" ]; then
 		extract_version "${TRELLIS_T3_ROOT}"
 		TRELLIS_T3_OAR="${TRELLIS_T3_ROOT}"/app/target/"${TRELLIS_T3_ARTIFACTID}"-"${PROJECT_VERSION}".oar
@@ -262,42 +270,20 @@ function trellis-t3-build {
 	cp "${TRELLIS_T3_OAR}" "${LOCAL_APPS}"/
 }
 
-function sonic-onos-driver-build {
-	build_app_local "${SONIC_DRIVER_ROOT}"/target \
-	"${SONIC_DRIVER_ROOT}"/ "driver" 
-	if [ "$MVN" -eq "0" ]; then
-		extract_version "${SONIC_DRIVER_ROOT}"
-		SONIC_DRIVER_OAR="${SONIC_DRIVER_ROOT}"/target/"${SONIC_DRIVER_ARTIFACTID}"-"${PROJECT_VERSION}".oar
-	fi
-	cp "${SONIC_DRIVER_OAR}" "${LOCAL_APPS}"/
-}
-
-function sonic-onos-pipeliner-build {
-	build_app_local "${SONIC_PIPELINER_ROOT}"/target \
-	"${SONIC_PIPELINER_ROOT}"/ "pipeliner" 
+function up4-build {
+	# Prepares app folder
+	cd "${UP4_ROOT}" || exit 1 && make "${UP4_TARGETS}"
+	cd ../
+	build_app_local "${UP4_ROOT}"/app/app/target \
+	"${UP4_ROOT}"/app "up4/app"
 	if [ "$MVN" -eq "0" ]; then
-		extract_version "${SONIC_PIPELINER_ROOT}"
-		SONIC_PIPELINE_OAR="${SONIC_PIPELINER_ROOT}"/target/"${SONIC_PIPELINER_ARTIFACTID}"-"${PROJECT_VERSION}".oar
+		extract_version "${UP4_ROOT}"/app
+		cd ../
+		UP4_OAR="${UP4_ROOT}"/app/app/target/"${UP4_ARTIFACTID}"-"${PROJECT_VERSION}".oar
 	fi
-	cp "${SONIC_PIPELINER_OAR}" "${LOCAL_APPS}"/
+	cp "${UP4_OAR}" "${LOCAL_APPS}"/
 }
 
-# function up4-build {
-# 	# Prepares app folder
-# 	cd "${UP4_ROOT}" || exit 1 && make "${UP4_TARGETS}"
-# 	cd ../
-# 	build_app "${UP4_ROOT}"/app/app/target \
-# 	"${UP4_ROOT}"/app "up4/app" \
-# 	"${UP4_ARTIFACT}" "${UP4_VERSION}" \
-# 	"app/app/target" "${UP4_OAR}" "${UP4_REPO}"
-# 	if [ "$MVN" -eq "0" ]; then
-# 		extract_version "${UP4_ROOT}"/app
-# 		cd ../
-# 		UP4_OAR="${UP4_ROOT}"/app/app/target/"${UP4_ARTIFACTID}"-"${PROJECT_VERSION}".oar
-# 	fi
-# 	cp "${UP4_OAR}" "${LOCAL_APPS}"/
-# }
-
 # function fabric-tna-build {
 # 	# This workaround is temporary - typically we need to build only the pipeconf
 # 	cd "${FABRIC_TNA_ROOT}" || exit 1 && make "${FABRIC_TNA_TARGETS[@]}" SHOW_SENSITIVE_OUTPUT="${SHOW_SENSITIVE_OUTPUT:-false}"
diff --git a/source-code/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java b/source-code/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
index 2971f9fc6eb0bafeea1418897e3feb0bbbbdb623..7c352c63ee30870ab1fca06a195b8830ce7443d9 100644
--- a/source-code/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
+++ b/source-code/apps/odtn/service/src/main/java/org/onosproject/odtn/impl/ServiceApplicationComponent.java
@@ -306,6 +306,10 @@ public class ServiceApplicationComponent implements TapiConnectivityService  {
                     break;
                 // TODO: Process device / port updated events
                 default:
+                    // ignore warn for devices using voltha driver
+                    if (event.subject().driver().name().contains("voltha")){
+                        break;
+                    }
                     log.warn("Unprocessed Event {}", event.type());
                     break;
             }
diff --git a/source-code/core/api/src/main/java/org/onosproject/net/Device.java b/source-code/core/api/src/main/java/org/onosproject/net/Device.java
index e0a3d69ebde17f62ebc44c69017292aa46c0d6d3..ba5f688aabaf3ef592f115a8efe1cc698ed70b6b 100644
--- a/source-code/core/api/src/main/java/org/onosproject/net/Device.java
+++ b/source-code/core/api/src/main/java/org/onosproject/net/Device.java
@@ -16,6 +16,7 @@
 package org.onosproject.net;
 
 import org.onlab.packet.ChassisId;
+import org.onosproject.net.driver.Driver;
 
 /**
  * Representation of a network infrastructure device.
@@ -81,4 +82,10 @@ public interface Device extends Element {
      */
     ChassisId chassisId();
 
+    /**
+     * Returns the device driver.
+     *
+     * @return driver
+     */
+    Driver driver();
 }
diff --git a/source-code/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java b/source-code/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
index f4594442ba6eb7e47bfce83e144b42854444148d..764f6f601b4ff4ae02cc9ba01fd5de73405c19bc 100644
--- a/source-code/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
+++ b/source-code/core/api/src/main/java/org/onosproject/net/utils/ForwardingDevice.java
@@ -20,6 +20,7 @@ import org.onosproject.net.Annotations;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.driver.Behaviour;
+import org.onosproject.net.driver.Driver;
 import org.onosproject.net.provider.ProviderId;
 
 import com.google.common.annotations.Beta;
@@ -86,4 +87,9 @@ public interface ForwardingDevice extends Device {
     default ChassisId chassisId() {
         return delegate().chassisId();
     }
+    
+    @Override
+    default Driver driver() {
+        return delegate().driver();
+    }
 }
diff --git a/source-code/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java b/source-code/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
index 714f113a103c92240cfd141b0408e8b698a0eebb..2071ec03c0d575443c0e167c8887b02da3387f0b 100644
--- a/source-code/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
+++ b/source-code/core/net/src/main/java/org/onosproject/core/impl/VersionManager.java
@@ -38,7 +38,7 @@ public class VersionManager implements VersionService {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final File VERSION_FILE = new File("../VERSION");
-    private static Version version = Version.version("3.0.0-ORANBR");
+    private static Version version = Version.version("2.5.9-ORANBR");
 
     @Activate
     protected void activate() {
diff --git a/source-code/tools/build/bazel/variables.bzl b/source-code/tools/build/bazel/variables.bzl
index 2b11d1c699a893ccdef1743c3ee047b8bac285b2..c431d8a673963c9853639489fd415022d03e69d2 100644
--- a/source-code/tools/build/bazel/variables.bzl
+++ b/source-code/tools/build/bazel/variables.bzl
@@ -1,4 +1,4 @@
-ONOS_VERSION = "3.0.0-ORANBR"
+ONOS_VERSION = "2.5.9-ORANBR"
 ONOS_ARTIFACT_BASE = "onos-"
 ONOS_GROUP_ID = "org.onosproject"
 ONOS_ORIGIN = "ONOS Community"
diff --git a/source-code/tools/build/envDefaults b/source-code/tools/build/envDefaults
index e7b905fa6014ee66bf739dad1ce477a6a07907f4..26b40fc432c4016b3b495a609dacd283dd49c889 100644
--- a/source-code/tools/build/envDefaults
+++ b/source-code/tools/build/envDefaults
@@ -18,7 +18,7 @@ export PATH="$ONOS_ROOT/tools/build:$PATH"
 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
 
 # ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="3.0.0-ORANBR"
+export ONOS_POM_VERSION="2.5.9-ORANBR"
 export ONOS_VERSION=${ONOS_VERSION:-2.5.9.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment