diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/ConnectusOvsdbClientInterface.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/ConnectusOvsdbClientInterface.java similarity index 77% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/ConnectusOvsdbClientInterface.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/ConnectusOvsdbClientInterface.java index d7413cc..e181d43 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/ConnectusOvsdbClientInterface.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/ConnectusOvsdbClientInterface.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.external.integration; +package com.telecominfraproject.wlan.opensync.external.integration; import java.util.Set; diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationInterface.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java similarity index 67% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationInterface.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java index 2e88d81..5bb8e51 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationInterface.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationInterface.java @@ -1,7 +1,8 @@ -package ai.connectus.opensync.external.integration; +package com.telecominfraproject.wlan.opensync.external.integration; + +import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo; +import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig; -import ai.connectus.opensync.external.integration.models.ConnectNodeInfo; -import ai.connectus.opensync.external.integration.models.OpensyncAPConfig; import sts.PlumeStats.Report; import traffic.NetworkMetadata.FlowReport; import wc.stats.IpDnsTelemetry.WCStatsReport; diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSession.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSession.java similarity index 93% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSession.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSession.java index 725a566..7a96f5d 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSession.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSession.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.external.integration; +package com.telecominfraproject.wlan.opensync.external.integration; import com.vmware.ovsdb.service.OvsdbClient; diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSessionMapInterface.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSessionMapInterface.java similarity index 86% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSessionMapInterface.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSessionMapInterface.java index 7344d28..b4a84b6 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/OvsdbSessionMapInterface.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OvsdbSessionMapInterface.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.external.integration; +package com.telecominfraproject.wlan.opensync.external.integration; import java.util.Set; diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/ConnectNodeInfo.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java similarity index 94% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/ConnectNodeInfo.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java index 438079b..ecd2372 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/ConnectNodeInfo.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/ConnectNodeInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.external.integration.models; +package com.telecominfraproject.wlan.opensync.external.integration.models; import java.util.HashMap; import java.util.Map; diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPConfig.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPConfig.java similarity index 91% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPConfig.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPConfig.java index 2991e44..f3a2185 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPConfig.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPConfig.java @@ -1,10 +1,10 @@ -package ai.connectus.opensync.external.integration.models; +package com.telecominfraproject.wlan.opensync.external.integration.models; import java.util.ArrayList; import java.util.List; -import com.whizcontrol.core.model.equipment.RadioType; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class OpensyncAPConfig extends BaseJsonModel { diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPRadioConfig.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioConfig.java similarity index 88% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPRadioConfig.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioConfig.java index c7da12a..ee1f722 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPRadioConfig.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPRadioConfig.java @@ -1,6 +1,6 @@ -package ai.connectus.opensync.external.integration.models; +package com.telecominfraproject.wlan.opensync.external.integration.models; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class OpensyncAPRadioConfig extends BaseJsonModel { diff --git a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPSsidConfig.java b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPSsidConfig.java similarity index 86% rename from opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPSsidConfig.java rename to opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPSsidConfig.java index f9f7606..228adb6 100644 --- a/opensync-ext-interface/src/main/java/ai/connectus/opensync/external/integration/models/OpensyncAPSsidConfig.java +++ b/opensync-ext-interface/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/models/OpensyncAPSsidConfig.java @@ -1,7 +1,7 @@ -package ai.connectus.opensync.external.integration.models; +package com.telecominfraproject.wlan.opensync.external.integration.models; -import com.whizcontrol.core.model.equipment.RadioType; -import com.whizcontrol.core.model.json.BaseJsonModel; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.core.model.json.BaseJsonModel; public class OpensyncAPSsidConfig extends BaseJsonModel { diff --git a/opensync-ext-static/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationSimple.java b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java similarity index 86% rename from opensync-ext-static/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationSimple.java rename to opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java index acb1963..5e9fc7d 100644 --- a/opensync-ext-static/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationSimple.java +++ b/opensync-ext-static/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationSimple.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.external.integration; +package com.telecominfraproject.wlan.opensync.external.integration; import java.io.IOException; @@ -10,9 +10,10 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; -import ai.connectus.opensync.external.integration.OpensyncExternalIntegrationInterface; -import ai.connectus.opensync.external.integration.models.ConnectNodeInfo; -import ai.connectus.opensync.external.integration.models.OpensyncAPConfig; +import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface; +import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo; +import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig; + import sts.PlumeStats.Report; import traffic.NetworkMetadata.FlowReport; import wc.stats.IpDnsTelemetry.WCStatsReport; diff --git a/opensync-gateway-static-process/pom.xml b/opensync-gateway-static-process/pom.xml index e389029..5a8e68f 100644 --- a/opensync-gateway-static-process/pom.xml +++ b/opensync-gateway-static-process/pom.xml @@ -11,7 +11,7 @@ Process definition for opensync gateway that uses static configuration - ai.connectus.opensync.experiment.OpenSyncProcess + com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess diff --git a/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch b/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch index 3579a35..3df0528 100644 --- a/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch +++ b/opensync-gateway-static-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) static.launch @@ -11,7 +11,7 @@ - + diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncConnectusController.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncConnectusController.java similarity index 91% rename from opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncConnectusController.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncConnectusController.java index 4109f08..a2eae7f 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncConnectusController.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncConnectusController.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.experiment; +package com.telecominfraproject.wlan.opensync.experiment; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import ai.connectus.opensync.external.integration.ConnectusOvsdbClientInterface; +import com.telecominfraproject.wlan.opensync.external.integration.ConnectusOvsdbClientInterface; @Profile("ovsdb_manager") @RestController diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncProcess.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncProcess.java similarity index 84% rename from opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncProcess.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncProcess.java index 1dfcd98..9824338 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/experiment/OpenSyncProcess.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/experiment/OpenSyncProcess.java @@ -1,11 +1,11 @@ -package ai.connectus.opensync.experiment; +package com.telecominfraproject.wlan.opensync.experiment; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; -@ComponentScan(basePackages={"com.whizcontrol", "ai.connectus"}) +@ComponentScan(basePackages={"com.telecominfraproject.wlan", "ai.connectus"}) @EnableAutoConfiguration public class OpenSyncProcess { diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/mqtt/OpensyncMqttClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java similarity index 97% rename from opensync-gateway/src/main/java/ai/connectus/opensync/mqtt/OpensyncMqttClient.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java index fb78dfd..5b1cea8 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/mqtt/OpensyncMqttClient.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/mqtt/OpensyncMqttClient.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.mqtt; +package com.telecominfraproject.wlan.opensync.mqtt; import java.nio.charset.Charset; import java.util.ArrayList; @@ -24,9 +24,9 @@ import com.google.protobuf.Descriptors; import com.google.protobuf.MessageOrBuilder; import com.google.protobuf.util.JsonFormat; import com.google.protobuf.util.JsonFormat.TypeRegistry; +import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface; +import com.telecominfraproject.wlan.opensync.util.ZlibUtil; -import ai.connectus.opensync.external.integration.OpensyncExternalIntegrationInterface; -import ai.connectus.opensync.util.ZlibUtil; import sts.PlumeStats; import sts.PlumeStats.Report; import traffic.NetworkMetadata; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbClient.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java similarity index 91% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbClient.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java index fa92251..b65c2b2 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbClient.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbClient.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb; +package com.telecominfraproject.wlan.opensync.ovsdb; import java.security.cert.X509Certificate; import java.util.Set; @@ -11,18 +11,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +import com.telecominfraproject.wlan.opensync.external.integration.ConnectusOvsdbClientInterface; +import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationInterface; +import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession; +import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface; +import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo; +import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao; +import com.telecominfraproject.wlan.opensync.util.SslUtil; import com.vmware.ovsdb.callback.ConnectionCallback; import com.vmware.ovsdb.service.OvsdbClient; import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener; -import ai.connectus.opensync.external.integration.ConnectusOvsdbClientInterface; -import ai.connectus.opensync.external.integration.OpensyncExternalIntegrationInterface; -import ai.connectus.opensync.external.integration.OvsdbSession; -import ai.connectus.opensync.external.integration.OvsdbSessionMapInterface; -import ai.connectus.opensync.external.integration.models.ConnectNodeInfo; -import ai.connectus.opensync.external.integration.models.OpensyncAPConfig; -import ai.connectus.opensync.ovsdb.dao.OvsdbDao; -import ai.connectus.opensync.util.SslUtil; import io.netty.handler.ssl.SslContext; @Profile("ovsdb_manager") diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbRedirector.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java similarity index 94% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbRedirector.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java index a31aad2..dbea031 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/ConnectusOvsdbRedirector.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/ConnectusOvsdbRedirector.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb; +package com.telecominfraproject.wlan.opensync.ovsdb; import java.security.cert.X509Certificate; @@ -10,12 +10,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Component; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao; +import com.telecominfraproject.wlan.opensync.util.SslUtil; import com.vmware.ovsdb.callback.ConnectionCallback; import com.vmware.ovsdb.service.OvsdbClient; import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener; -import ai.connectus.opensync.ovsdb.dao.OvsdbDao; -import ai.connectus.opensync.util.SslUtil; import io.netty.handler.ssl.SslContext; @Profile("ovsdb_redirector") diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/NettySslContextConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/NettySslContextConfig.java similarity index 98% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/NettySslContextConfig.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/NettySslContextConfig.java index 77a07b1..5777282 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/NettySslContextConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/NettySslContextConfig.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb; +package com.telecominfraproject.wlan.opensync.ovsdb; import java.io.File; import java.io.FileInputStream; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbListenerConfig.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbListenerConfig.java similarity index 95% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbListenerConfig.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbListenerConfig.java index 482a94d..f4458cc 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbListenerConfig.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbListenerConfig.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb; +package com.telecominfraproject.wlan.opensync.ovsdb; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbSessionMap.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbSessionMap.java similarity index 91% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbSessionMap.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbSessionMap.java index 5a7dda4..7167bfa 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/OvsdbSessionMap.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/OvsdbSessionMap.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb; +package com.telecominfraproject.wlan.opensync.ovsdb; import java.util.HashSet; import java.util.Set; @@ -9,11 +9,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession; +import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface; import com.vmware.ovsdb.service.OvsdbClient; -import ai.connectus.opensync.external.integration.OvsdbSession; -import ai.connectus.opensync.external.integration.OvsdbSessionMapInterface; - @Component public class OvsdbSessionMap implements OvsdbSessionMapInterface { diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/OvsdbDao.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java similarity index 98% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/OvsdbDao.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java index 442909d..02febf7 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/OvsdbDao.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/OvsdbDao.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao; +package com.telecominfraproject.wlan.opensync.ovsdb.dao; import java.util.ArrayList; import java.util.HashMap; @@ -15,6 +15,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import com.telecominfraproject.wlan.core.model.equipment.RadioType; +import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo; +import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPRadioConfig; +import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPSsidConfig; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.BridgeInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.InterfaceInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.PortInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiInetConfigInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiRadioConfigInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiStatsConfigInfo; +import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo; import com.vmware.ovsdb.exception.OvsdbClientException; import com.vmware.ovsdb.protocol.operation.Delete; import com.vmware.ovsdb.protocol.operation.Insert; @@ -31,18 +42,6 @@ import com.vmware.ovsdb.protocol.operation.result.InsertResult; import com.vmware.ovsdb.protocol.operation.result.OperationResult; import com.vmware.ovsdb.protocol.operation.result.SelectResult; import com.vmware.ovsdb.service.OvsdbClient; -import com.whizcontrol.core.model.equipment.RadioType; - -import ai.connectus.opensync.external.integration.models.ConnectNodeInfo; -import ai.connectus.opensync.external.integration.models.OpensyncAPRadioConfig; -import ai.connectus.opensync.external.integration.models.OpensyncAPSsidConfig; -import ai.connectus.opensync.ovsdb.dao.models.BridgeInfo; -import ai.connectus.opensync.ovsdb.dao.models.InterfaceInfo; -import ai.connectus.opensync.ovsdb.dao.models.PortInfo; -import ai.connectus.opensync.ovsdb.dao.models.WifiInetConfigInfo; -import ai.connectus.opensync.ovsdb.dao.models.WifiRadioConfigInfo; -import ai.connectus.opensync.ovsdb.dao.models.WifiStatsConfigInfo; -import ai.connectus.opensync.ovsdb.dao.models.WifiVifConfigInfo; @Component public class OvsdbDao { diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/BridgeInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/BridgeInfo.java similarity index 92% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/BridgeInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/BridgeInfo.java index bb8d0db..ecfe149 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/BridgeInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/BridgeInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashSet; import java.util.Set; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/InterfaceInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/InterfaceInfo.java similarity index 94% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/InterfaceInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/InterfaceInfo.java index 9cc419d..1f2c1ef 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/InterfaceInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/InterfaceInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashMap; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/PortInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/PortInfo.java similarity index 92% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/PortInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/PortInfo.java index 3855e11..5db1965 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/PortInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/PortInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashSet; import java.util.Set; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiInetConfigInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiInetConfigInfo.java similarity index 93% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiInetConfigInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiInetConfigInfo.java index a74c16a..ab44be4 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiInetConfigInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiInetConfigInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import com.vmware.ovsdb.protocol.operation.notation.Uuid; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java similarity index 95% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java index 63c7fe4..83fa8a6 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiRadioConfigInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashMap; import java.util.HashSet; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java similarity index 96% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java index 1f2cade..cae0c17 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiStatsConfigInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashMap; import java.util.HashSet; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiVifConfigInfo.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiVifConfigInfo.java similarity index 95% rename from opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiVifConfigInfo.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiVifConfigInfo.java index c9c2d68..c3ebb43 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/ovsdb/dao/models/WifiVifConfigInfo.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/ovsdb/dao/models/WifiVifConfigInfo.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.ovsdb.dao.models; +package com.telecominfraproject.wlan.opensync.ovsdb.dao.models; import java.util.HashMap; import java.util.Map; diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/util/SslUtil.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/SslUtil.java similarity index 95% rename from opensync-gateway/src/main/java/ai/connectus/opensync/util/SslUtil.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/SslUtil.java index 918fa31..a2527fc 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/util/SslUtil.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/SslUtil.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.util; +package com.telecominfraproject.wlan.opensync.util; public class SslUtil { diff --git a/opensync-gateway/src/main/java/ai/connectus/opensync/util/ZlibUtil.java b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/ZlibUtil.java similarity index 98% rename from opensync-gateway/src/main/java/ai/connectus/opensync/util/ZlibUtil.java rename to opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/ZlibUtil.java index 06f1285..7d43d82 100644 --- a/opensync-gateway/src/main/java/ai/connectus/opensync/util/ZlibUtil.java +++ b/opensync-gateway/src/main/java/com/telecominfraproject/wlan/opensync/util/ZlibUtil.java @@ -1,4 +1,4 @@ -package ai.connectus.opensync.util; +package com.telecominfraproject.wlan.opensync.util; import java.util.ArrayList; import java.util.List; diff --git a/opensync-gateway/src/main/resources/launchers/OpenSyncProcess (local, KDC certs).launch b/opensync-gateway/src/main/resources/launchers/OpenSyncProcess (local, KDC certs).launch index 1b37c04..44c6c34 100644 --- a/opensync-gateway/src/main/resources/launchers/OpenSyncProcess (local, KDC certs).launch +++ b/opensync-gateway/src/main/resources/launchers/OpenSyncProcess (local, KDC certs).launch @@ -9,7 +9,7 @@ - + diff --git a/opensync-gateway/src/main/resources/logback.xml b/opensync-gateway/src/main/resources/logback.xml index e9e2846..9b2ea86 100644 --- a/opensync-gateway/src/main/resources/logback.xml +++ b/opensync-gateway/src/main/resources/logback.xml @@ -56,7 +56,7 @@ - +