renamed com.whizcontrol java packages into com.telecominfraproject.wlan

This commit is contained in:
DTop
2020-03-02 17:52:17 -05:00
parent 61e60e5640
commit e0baabc078
31 changed files with 70 additions and 70 deletions

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.external.integration;
package com.telecominfraproject.wlan.opensync.external.integration;
import java.util.Set;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.external.integration;
package com.telecominfraproject.wlan.opensync.external.integration;
import com.vmware.ovsdb.service.OvsdbClient;

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.external.integration;
package com.telecominfraproject.wlan.opensync.external.integration;
import java.util.Set;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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;

View File

@@ -11,7 +11,7 @@
<description>Process definition for opensync gateway that uses static configuration</description>
<properties>
<start-class>ai.connectus.opensync.experiment.OpenSyncProcess</start-class>
<start-class>com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess</start-class>
</properties>
<dependencies>

View File

@@ -11,7 +11,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OpenJDK 13.0.2"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ai.connectus.opensync.experiment.OpenSyncProcess"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync_gateway_static_process"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dssl.props=file://${connectus_certs}/ssl.properties&#10;-Dwhizcontrol.httpClientConfig=file://${connectus_certs}/httpClientConfig.json&#10;&#10;-D123javax.net.ssl.keyStore=${connectus_certs}/client2Keystore.jks&#10;-D123javax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.keyStore=${plume_certs}/plume_client_keystore.jks&#10;-Djavax.net.ssl.trustStore=${plume_certs}/plume_truststore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=192.168.0.137&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-D123connectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-D123connectus.ovsdb.keyStore=${connectus_certs}/server.p12&#10;-Dconnectus.ovsdb.trustStore=${plume_certs}/plume_truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${plume_certs}/opensync_server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync_ext_static}/src/main/resources/config_2_ssids.json&#10;&#10;-D123connectus.mqttBroker.address=testportal.123wlan.com&#10;-Dconnectus.mqttBroker.address=mqtt.zone1.art2wave.com&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;&#10;-Dspring.profiles.include=ovsdb_redirector,ovsdb_manager&#10;-D123spring.profiles.include=mqtt_receiver,ovsdb_redirector,ovsdb_manager&#10;-D123spring.profiles.include=mqtt_receiver"/>

View File

@@ -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

View File

@@ -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 {

View File

@@ -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;

View File

@@ -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")

View File

@@ -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")

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.ovsdb;
package com.telecominfraproject.wlan.opensync.ovsdb;
import java.io.File;
import java.io.FileInputStream;

View File

@@ -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;

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.ovsdb.dao.models;
package com.telecominfraproject.wlan.opensync.ovsdb.dao.models;
import java.util.HashMap;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.util;
package com.telecominfraproject.wlan.opensync.util;
public class SslUtil {

View File

@@ -1,4 +1,4 @@
package ai.connectus.opensync.util;
package com.telecominfraproject.wlan.opensync.util;
import java.util.ArrayList;
import java.util.List;

View File

@@ -9,7 +9,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_EXCLUDE_TEST_CODE" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="ai.connectus.opensync.experiment.OpenSyncProcess"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.telecominfraproject.wlan.opensync.experiment.OpenSyncProcess"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync_gateway"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dssl.props=file://${connectus_certs}/ssl.properties&#10;-Dwhizcontrol.httpClientConfig=file://${connectus_certs}/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client2Keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=192.168.0.137&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.p12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync_ext_static}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=testportal.123wlan.com&#10;-Dconnectus.mqttBroker.listenPort=1883"/>

View File

@@ -56,7 +56,7 @@
<logger name="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" level="INFO"/>
<logger name="org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainer" level="INFO"/>
<logger name="com.whizcontrol" level="DEBUG"/>
<logger name="com.telecominfraproject.wlan" level="DEBUG"/>
<logger name="ai.connectus" level="DEBUG"/>
<logger name="com.netflix.servo.tag.aws.AwsInjectableTag" level="OFF"/>
<logger name="com.vmware.ovsdb.service.OvsdbConnectionInfo" level="OFF"/>