mirror of
https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git
synced 2025-10-31 18:47:57 +00:00
Compare commits
1 Commits
WIFI-7323
...
change_ses
| Author | SHA1 | Date | |
|---|---|---|---|
|
49d59dcd15 |
@@ -5,26 +5,17 @@ import java.net.Inet4Address;
|
||||
import java.net.Inet6Address;
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.Instant;
|
||||
import java.time.temporal.ChronoField;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.Arrays;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
@@ -46,13 +37,11 @@ import com.telecominfraproject.wlan.client.session.models.AssociationState;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSession;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSessionMetricDetails;
|
||||
import com.telecominfraproject.wlan.core.model.entity.CountryCode;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.ChannelBandwidth;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.LedStatus;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.WiFiSessionUtility;
|
||||
import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
|
||||
import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
|
||||
import com.telecominfraproject.wlan.customer.models.Customer;
|
||||
@@ -114,6 +103,7 @@ import com.telecominfraproject.wlan.status.equipment.models.EquipmentProtocolSta
|
||||
import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeState;
|
||||
import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeState.FailureReason;
|
||||
import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeStatusData;
|
||||
import com.telecominfraproject.wlan.status.equipment.models.LedStatus;
|
||||
import com.telecominfraproject.wlan.status.equipment.models.VLANStatusData;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
|
||||
@@ -121,8 +111,6 @@ import com.telecominfraproject.wlan.status.equipment.report.models.ClientConnect
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.EquipmentScanDetails;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.OperatingSystemPerformance;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.RadioUtilizationReport;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredEthernetPortStatusData;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
|
||||
import com.telecominfraproject.wlan.status.models.Status;
|
||||
import com.telecominfraproject.wlan.status.models.StatusCode;
|
||||
import com.telecominfraproject.wlan.status.models.StatusDataType;
|
||||
@@ -131,18 +119,10 @@ import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEv
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.ApcElectionEvent.ApcMode;
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
|
||||
|
||||
import sts.OpensyncStats.Report;
|
||||
|
||||
@org.springframework.context.annotation.Profile("opensync_cloud_config")
|
||||
@Component
|
||||
public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegrationInterface {
|
||||
|
||||
protected static final String standard_linux_date_format = "EEE MMM dd HH:mm:ss zzz yyyy";
|
||||
private static final String VLAN_TRUNK_IF_TYPE = "vlan_trunk";
|
||||
private static final String ALLOWED_VLANS = "allowed_vlans";
|
||||
private static final String NATIVE_VLAN_ID = "pvid";
|
||||
private static final String SPACE_SEPERATOR = " ";
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(OpensyncExternalIntegrationCloud.class);
|
||||
|
||||
@Autowired
|
||||
@@ -164,7 +144,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
@Autowired
|
||||
private FirmwareServiceInterface firmwareServiceInterface;
|
||||
@Autowired
|
||||
private StatsPublisherInterface statsPublisherInterface;
|
||||
private StatsPublisherInterface mqttMessageProcessor;
|
||||
@Autowired
|
||||
private AlarmServiceInterface alarmServiceInterface;
|
||||
|
||||
@@ -193,8 +173,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
public String defaultWanInterfaceType;
|
||||
@Value("${tip.wlan.ovsdb.wifi-iface.default_wan_name:wan}")
|
||||
public String defaultWanInterfaceName;
|
||||
@Value("${tip.wlan.ovsdb.wifi-iface.default_wan6_name:wan6}")
|
||||
public String defaultWan6InterfaceName;
|
||||
|
||||
@Value("${tip.wlan.ovsdb.syncUpRadioConfigsForProvisionedEquipment:true}")
|
||||
private boolean syncUpRadioConfigsForProvisionedEquipment;
|
||||
@@ -232,14 +210,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
}
|
||||
|
||||
long locationId = autoProvisionedLocationId;
|
||||
if ((customer.getDetails() != null) && (customer.getDetails().getAutoProvisioning() != null)
|
||||
&& customer.getDetails().getAutoProvisioning().isEnabled()) {
|
||||
locationId = customer.getDetails().getAutoProvisioning().getLocationId();
|
||||
}
|
||||
locationId = customer.getDetails().getAutoProvisioning().getLocationId();
|
||||
|
||||
try {
|
||||
Location location = locationServiceInterface.getOrNull(locationId);
|
||||
if (location != null)
|
||||
ce.setLocationId(location.getId());
|
||||
Location location = locationServiceInterface.get(locationId);
|
||||
ce.setLocationId(location.getId());
|
||||
} catch (Exception e) {
|
||||
LOG.error("Cannot auto-provision equipment because customer location with id {} cannot be found", locationId);
|
||||
throw new IllegalStateException("Cannot auto-provision equipment because customer location cannot be found : " + locationId);
|
||||
@@ -406,7 +381,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
EquipmentRoutingRecord equipmentRoutingRecord = gatewayController.registerCustomerEquipment(ce.getName(), ce.getCustomerId(), ce.getId());
|
||||
|
||||
// Status and client cleanup, when AP reconnects or has been
|
||||
@@ -428,30 +403,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
LOG.info("AP {} got connected to the gateway", apId);
|
||||
LOG.info("ConnectNodeInfo {}", connectNodeInfo);
|
||||
|
||||
if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY) && connectNodeInfo.versionMatrix.containsKey("DATE")) {
|
||||
// The AP uses standard linux date format. So the format would be:
|
||||
// root@OpenAp-0498b5:~# date
|
||||
// Tue Aug 3 14:55:28 UTC 2021
|
||||
DateFormat dateFormat = new SimpleDateFormat(standard_linux_date_format, Locale.ENGLISH);
|
||||
String dateString = connectNodeInfo.versionMatrix.get("DATE").strip();
|
||||
try {
|
||||
Date date = dateFormat.parse(dateString);
|
||||
reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
|
||||
connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), date.getTime(), connectNodeInfo.model,
|
||||
connectNodeInfo.firmwareVersion);
|
||||
} catch (java.text.ParseException p) {
|
||||
LOG.info("Could not parse release date {} from AP fw, set date to EPOCH start value.", dateString, Instant.EPOCH);
|
||||
reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY),
|
||||
connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_INACTIVE_KEY), Instant.EPOCH.getLong(ChronoField.INSTANT_SECONDS), connectNodeInfo.model,
|
||||
connectNodeInfo.firmwareVersion);
|
||||
}
|
||||
if (connectNodeInfo.versionMatrix.containsKey(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY)) {
|
||||
reconcileFwVersionToTrack(ce, connectNodeInfo.versionMatrix.get(OvsdbStringConstants.FW_IMAGE_ACTIVE_KEY), connectNodeInfo.model);
|
||||
} else {
|
||||
LOG.info("Cloud based firmware upgrade is not supported for this AP");
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
LOG.error("Could not process connection from AP {}", apId, e);
|
||||
throw new RuntimeException(e);
|
||||
throw e;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -582,11 +542,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
protocolStatusData.setBandPlan("FCC");
|
||||
protocolStatusData.setBaseMacAddress(MacAddress.valueOf(connectNodeInfo.macAddress));
|
||||
protocolStatusData.setCloudCfgDataVersion(42L);
|
||||
//this will be set later in the flow - after the config is successfully pushed to the AP
|
||||
//protocolStatusData.setReportedCfgDataVersion(42L);
|
||||
CountryCode countryCode = Location.getCountryCode(locationServiceInterface.getOrNull(ce.getLocationId()));
|
||||
if (countryCode != null)
|
||||
protocolStatusData.setCountryCode(countryCode.getName());
|
||||
protocolStatusData.setReportedCfgDataVersion(42L);
|
||||
CountryCode countryCode = Location.getCountryCode(locationServiceInterface.get(ce.getLocationId()));
|
||||
protocolStatusData.setCountryCode(countryCode.getName());
|
||||
if (connectNodeInfo.country != null) {
|
||||
protocolStatusData.setReportedCC(CountryCode.getByName(connectNodeInfo.country));
|
||||
}
|
||||
@@ -763,97 +721,102 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
|
||||
}
|
||||
|
||||
void reconcileFwVersionToTrack(Equipment ce, String activeFirmwareImageAp, String inactiveFirmwareImageAp, Long activeFwReleaseDate, String model,
|
||||
String firmwareVersion) {
|
||||
private void reconcileFwVersionToTrack(Equipment ce, String reportedFwVersionFromAp, String model) {
|
||||
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), reportedFwVersionFromAp, model);
|
||||
Status statusRecord = statusServiceInterface.getOrNull(ce.getCustomerId(), ce.getId(), StatusDataType.FIRMWARE);
|
||||
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} with active firmware version {} model {}", ce.getInventoryId(), activeFirmwareImageAp, model);
|
||||
Status statusRecord = statusServiceInterface.getOrNull(autoProvisionedCustomerId, autoProvisionedCustomerId, StatusDataType.FIRMWARE);
|
||||
if (statusRecord == null) {
|
||||
statusRecord = new Status();
|
||||
statusRecord.setCreatedTimestamp(System.currentTimeMillis());
|
||||
statusRecord.setCustomerId(ce.getCustomerId());
|
||||
statusRecord.setEquipmentId(ce.getId());
|
||||
statusRecord.setStatusDataType(StatusDataType.FIRMWARE);
|
||||
statusRecord.setDetails(new EquipmentUpgradeStatusData());
|
||||
((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(activeFirmwareImageAp);
|
||||
if (inactiveFirmwareImageAp != null) {
|
||||
((EquipmentUpgradeStatusData) statusRecord.getDetails()).setActiveSwVersion(inactiveFirmwareImageAp);
|
||||
}
|
||||
}
|
||||
EquipmentUpgradeStatusData fwUpgradeStatusData = (EquipmentUpgradeStatusData) statusRecord.getDetails();
|
||||
fwUpgradeStatusData.setActiveSwVersion(firmwareVersion);
|
||||
fwUpgradeStatusData.setAlternateSwVersion(inactiveFirmwareImageAp);
|
||||
|
||||
// default track settings for firmware
|
||||
CustomerFirmwareTrackSettings trackSettings = firmwareServiceInterface.getDefaultCustomerTrackSetting();
|
||||
|
||||
// check for updated/modified track settings for this customer
|
||||
CustomerFirmwareTrackRecord custFwTrackRecord = firmwareServiceInterface.getCustomerFirmwareTrackRecord(ce.getCustomerId());
|
||||
if (custFwTrackRecord != null)
|
||||
trackSettings = custFwTrackRecord.getSettings();
|
||||
|
||||
long trackRecordId = -1;
|
||||
if (custFwTrackRecord != null) {
|
||||
trackSettings = custFwTrackRecord.getSettings();
|
||||
trackRecordId = custFwTrackRecord.getTrackRecordId();
|
||||
}
|
||||
// determine if AP requires FW upgrade before cloud
|
||||
// connection/provision
|
||||
if (trackSettings.getAutoUpgradeDeprecatedOnBind().equals(TrackFlag.ALWAYS) || trackSettings.getAutoUpgradeUnknownOnBind().equals(TrackFlag.ALWAYS)) {
|
||||
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} track flag for auto-upgrade {}", ce.getInventoryId(),
|
||||
trackSettings.getAutoUpgradeDeprecatedOnBind());
|
||||
|
||||
// check the reported fw version for the AP, if it is < than
|
||||
// the default version for the cloud, then download and
|
||||
// flash the firmware before proceeding.
|
||||
// then return;
|
||||
FirmwareTrackRecord fwTrackRecord = null;
|
||||
if (custFwTrackRecord == null) {
|
||||
if (trackRecordId == -1) {
|
||||
// take the default
|
||||
fwTrackRecord = firmwareServiceInterface.getFirmwareTrackByName(FirmwareTrackRecord.DEFAULT_TRACK_NAME);
|
||||
|
||||
} else {
|
||||
// there must be a customer one
|
||||
fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(custFwTrackRecord.getTrackRecordId());
|
||||
fwTrackRecord = firmwareServiceInterface.getFirmwareTrackById(trackRecordId);
|
||||
}
|
||||
|
||||
if (fwTrackRecord != null) {
|
||||
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} firmwareTrackRecord {}", ce.getInventoryId(), fwTrackRecord);
|
||||
Optional<FirmwareTrackAssignmentDetails> assignmentDetails = firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName())
|
||||
.stream().filter(new Predicate<FirmwareTrackAssignmentDetails>() {
|
||||
@Override
|
||||
public boolean test(FirmwareTrackAssignmentDetails t) {
|
||||
// AP may report type as UPPER case
|
||||
return model.equalsIgnoreCase(t.getModelId());
|
||||
}
|
||||
}).findFirst();
|
||||
if (assignmentDetails.isPresent()) {
|
||||
FirmwareTrackAssignmentDetails targetFirmwareForTrack = assignmentDetails.get();
|
||||
if (activeFwReleaseDate == null) {
|
||||
LOG.info("Active FW release date is unknown, firmware upgrade required.");
|
||||
fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
|
||||
fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
|
||||
statusRecord.setDetails(fwUpgradeStatusData);
|
||||
statusRecord = statusServiceInterface.update(statusRecord);
|
||||
triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
|
||||
} else {
|
||||
Date activeReleaseDate = new Date(activeFwReleaseDate);
|
||||
Date targetReleaseDate = new Date(targetFirmwareForTrack.getReleaseDate());
|
||||
if (activeReleaseDate.after(targetReleaseDate) || activeReleaseDate.equals(targetReleaseDate)) {
|
||||
LOG.info("Active FW release date {} is more recent than or equal to the target firmware release date {}, no upgrade required.",
|
||||
activeReleaseDate, targetReleaseDate);
|
||||
fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
|
||||
fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
|
||||
statusRecord.setDetails(fwUpgradeStatusData);
|
||||
statusRecord = statusServiceInterface.update(statusRecord);
|
||||
} else {
|
||||
LOG.info("Active FW release date {} is earlier than target firmware release date {}, firmware upgrade required.", activeReleaseDate,
|
||||
targetReleaseDate);
|
||||
fwUpgradeStatusData.setTargetSwVersion(targetFirmwareForTrack.getVersionName());
|
||||
|
||||
List<FirmwareTrackAssignmentDetails> fwTrackAssignmentDetails =
|
||||
firmwareServiceInterface.getFirmwareTrackAssignments(fwTrackRecord.getTrackName());
|
||||
|
||||
String targetFwVersionNameForTrack = null;
|
||||
|
||||
if (fwTrackAssignmentDetails != null) {
|
||||
for (FirmwareTrackAssignmentDetails details : fwTrackAssignmentDetails) {
|
||||
if (model.equalsIgnoreCase(details.getModelId())) {
|
||||
targetFwVersionNameForTrack = details.getVersionName();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (targetFwVersionNameForTrack == null) {
|
||||
LOG.info("No target FW version for this track {}", fwTrackRecord);
|
||||
|
||||
} else {
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion for track {}", ce.getInventoryId(), targetFwVersionNameForTrack);
|
||||
|
||||
if (reportedFwVersionFromAp != null) {
|
||||
if (!targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
|
||||
LOG.debug(
|
||||
"reconcileFwVersionToTrack for AP {} targetFwVersion {} doesn't match reported fw version {}, triggering download and flash",
|
||||
ce.getInventoryId(), targetFwVersionNameForTrack, reportedFwVersionFromAp);
|
||||
|
||||
fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
|
||||
fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.out_of_date);
|
||||
statusRecord.setDetails(fwUpgradeStatusData);
|
||||
statusRecord = statusServiceInterface.update(statusRecord);
|
||||
triggerFwDownload(ce, fwUpgradeStatusData, trackSettings);
|
||||
} else if (targetFwVersionNameForTrack.equals(reportedFwVersionFromAp)) {
|
||||
LOG.debug("reconcileFwVersionToTrack for AP {} targetFwVersion {} is active", ce.getInventoryId(), targetFwVersionNameForTrack);
|
||||
|
||||
fwUpgradeStatusData.setUpgradeState(EquipmentUpgradeState.up_to_date);
|
||||
fwUpgradeStatusData.setActiveSwVersion(targetFwVersionNameForTrack);
|
||||
fwUpgradeStatusData.setAlternateSwVersion(targetFwVersionNameForTrack);
|
||||
fwUpgradeStatusData.setTargetSwVersion(targetFwVersionNameForTrack);
|
||||
|
||||
statusRecord.setDetails(fwUpgradeStatusData);
|
||||
statusRecord = statusServiceInterface.update(statusRecord);
|
||||
|
||||
}
|
||||
}
|
||||
} else {
|
||||
LOG.info("No firmware assignment present in track for AP model {}. Auto-upgrade of firmware is not possible for this node.", model);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
} else {
|
||||
LOG.info("Automatic firmware upgrade is not configured for track {}", trackSettings);
|
||||
|
||||
} else
|
||||
|
||||
{
|
||||
LOG.debug("Automatic firmware upgrade is not configured for track {}", trackSettings);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1020,10 +983,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
ret.setRfProfile(profileContainer.getChildOfTypeOrNull(equipmentConfig.getProfileId(), ProfileType.rf));
|
||||
|
||||
ret.setSsidProfile(profileContainer.getChildrenOfType(equipmentConfig.getProfileId(), ProfileType.ssid));
|
||||
|
||||
ret.setWiredEthernetPortProfile(
|
||||
profileContainer.getChildOfTypeOrNullByEquipmentModel(equipmentConfig.getProfileId(),
|
||||
ProfileType.wired_ethernet_port, equipmentConfig.getDetails().getEquipmentModel()));
|
||||
|
||||
ret.setMetricsProfiles(profileContainer.getChildrenOfType(equipmentConfig.getProfileId(), ProfileType.service_metrics_collection_config));
|
||||
|
||||
@@ -1154,8 +1113,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
continue;
|
||||
}
|
||||
|
||||
LOG.debug("Values from Vif State Mac (BSSID) {} SSID {} AssociatedClients {} Channel {}", bssid, ssid,
|
||||
vifState.getAssociatedClients(), channel);
|
||||
LOG.debug("Values from Vif State Mac (BSSID) {} SSID {} AssociatedClients {} Channel {}", bssid, ssid, vifState.getAssociatedClients());
|
||||
|
||||
RadioType radioType = null;
|
||||
Map<RadioType, RfElementConfiguration> rfElementMap = rfConfig.getRfConfigMap();
|
||||
@@ -1354,33 +1312,10 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
channelStatus.setDetails(channelStatusData);
|
||||
}
|
||||
((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelNumberStatusDataMap().put(radioState.getFreqBand(), radioState.getChannel());
|
||||
ChannelBandwidth channelBandwidth = convertHtModeToChannelBandwidth(radioState.getHtMode());
|
||||
((EquipmentChannelStatusData) channelStatus.getDetails()).getChannelBandwidthStatusDataMap().put(radioState.getFreqBand(), channelBandwidth);
|
||||
((EquipmentChannelStatusData) channelStatus.getDetails()).getTxPowerDataMap().put(radioState.getFreqBand(), radioState.getTxPower());
|
||||
return channelStatus;
|
||||
}
|
||||
|
||||
private ChannelBandwidth convertHtModeToChannelBandwidth(String htMode) {
|
||||
if (htMode == null) {
|
||||
return null;
|
||||
}
|
||||
switch (htMode) {
|
||||
case "HT20":
|
||||
return ChannelBandwidth.is20MHz;
|
||||
case "HT40":
|
||||
case "HT40-":
|
||||
case "HT40+":
|
||||
return ChannelBandwidth.is40MHz;
|
||||
case "HT80":
|
||||
return ChannelBandwidth.is80MHz;
|
||||
case "HT160":
|
||||
return ChannelBandwidth.is160MHz;
|
||||
default:
|
||||
LOG.warn("Unrecognized channel HtMode {}", htMode);
|
||||
return ChannelBandwidth.UNSUPPORTED;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private boolean updateChannelPowerLevels(String apId, ApElementConfiguration apElementConfiguration, OpensyncAPRadioState radioState) {
|
||||
|
||||
boolean configStateMismatch = false;
|
||||
@@ -1430,7 +1365,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
apElementConfiguration.getRadioMap().get(radioState.getFreqBand()).setAllowedChannelsPowerLevels(channelPowerLevels);
|
||||
}
|
||||
|
||||
LOG.debug("Updated AllowedChannels from Wifi_Radio_State table change for AP {} configStateMismatch {}", apId, configStateMismatch);
|
||||
LOG.debug("Updated AllowedChannels from Wifi_Radio_State table change for AP {}", apId);
|
||||
return configStateMismatch;
|
||||
}
|
||||
|
||||
@@ -1487,7 +1422,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
public void wifiInetStateDbTableUpdate(List<OpensyncAPInetState> inetStateTables, String apId) {
|
||||
|
||||
LOG.debug("Received Wifi_Inet_State table update for AP {}", apId);
|
||||
|
||||
|
||||
OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
|
||||
|
||||
if (ovsdbSession == null) {
|
||||
@@ -1501,6 +1436,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
LOG.debug("wifiInetStateDbTableUpdate Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("wifiInetStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
@@ -1530,48 +1466,26 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
}
|
||||
|
||||
EquipmentProtocolStatusData protocolStatusData = (EquipmentProtocolStatusData) protocolStatus.getDetails();
|
||||
|
||||
Status ethernetPortStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.WIRED_ETHERNET_PORT);
|
||||
if (ethernetPortStatus == null) {
|
||||
ethernetPortStatus = new Status();
|
||||
ethernetPortStatus.setCustomerId(customerId);
|
||||
ethernetPortStatus.setEquipmentId(equipmentId);
|
||||
ethernetPortStatus.setStatusDataType(StatusDataType.WIRED_ETHERNET_PORT);
|
||||
ethernetPortStatus.setDetails(new WiredEthernetPortStatusData());
|
||||
ethernetPortStatus = statusServiceInterface.update(ethernetPortStatus);
|
||||
}
|
||||
|
||||
WiredEthernetPortStatusData ethernetPortStatusData = (WiredEthernetPortStatusData) ethernetPortStatus.getDetails();
|
||||
Map<String, List<WiredPortStatus>> portStatus = ethernetPortStatusData.getInterfacePortStatusMap();
|
||||
|
||||
for (OpensyncAPInetState inetState : inetStateTables) {
|
||||
if (inetState.ifName != null) {
|
||||
parseRawDataToWiredPortStatus(customerId, equipmentId, portStatus, inetState);
|
||||
ethernetPortStatusData.setInterfacePortStatusMap(portStatus);
|
||||
ethernetPortStatus.setDetails(ethernetPortStatusData);
|
||||
ethernetPortStatus = statusServiceInterface.update(ethernetPortStatus);
|
||||
LOG.debug("EthernetPortStatus for AP {} updated to {}", apId, ethernetPortStatus);
|
||||
}
|
||||
for (OpensyncAPInetState inetState : inetStateTables) {
|
||||
|
||||
if (inetState.ifName != null && inetState.ifName.equals(defaultWanInterfaceName)) {
|
||||
if (inetState.ifName != null && inetState.ifName.equals(defaultWanInterfaceName)) {
|
||||
|
||||
if (inetState.inetAddr != null) {
|
||||
try {
|
||||
protocolStatusData.setReportedIpV4Addr(Inet4Address.getByName(inetState.inetAddr));
|
||||
protocolStatus.setDetails(protocolStatusData);
|
||||
protocolStatus = statusServiceInterface.update(protocolStatus);
|
||||
LOG.info("Updated IpV4Addr for AP {} to {} from Wifi_Inet_State change for if_name {}", apId,
|
||||
((EquipmentProtocolStatusData) protocolStatus.getDetails()).getReportedIpV4Addr(),
|
||||
inetState.ifName);
|
||||
LOG.debug("ProtocolStatus for AP {} updated to {}", apId, protocolStatus);
|
||||
if (inetState.inetAddr != null) {
|
||||
try {
|
||||
protocolStatusData.setReportedIpV4Addr(Inet4Address.getByName(inetState.inetAddr));
|
||||
protocolStatus.setDetails(protocolStatusData);
|
||||
protocolStatus = statusServiceInterface.update(protocolStatus);
|
||||
LOG.info("Updated IpV4Addr for AP {} to {} from Wifi_Inet_State change for if_name {}", apId,
|
||||
((EquipmentProtocolStatusData) protocolStatus.getDetails()).getReportedIpV4Addr(), inetState.ifName);
|
||||
LOG.debug("ProtocolStatus for AP {} updated to {}", apId, protocolStatus);
|
||||
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Could not set IpV4Addr {} on AP {} due to UnknownHostException ", inetState.inetAddr,
|
||||
apId, e);
|
||||
}
|
||||
}
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Could not set IpV4Addr {} on AP {} due to UnknownHostException ", inetState.inetAddr, apId, e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (inetState.getIfType().equals("vlan") && inetState.parentIfName != null && inetState.parentIfName.equals(defaultWanInterfaceName)) {
|
||||
|
||||
@@ -1625,122 +1539,13 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
|
||||
}
|
||||
|
||||
protected void parseRawDataToWiredPortStatus(int customerId, long equipmentId,
|
||||
Map<String, List<WiredPortStatus>> portStatus, OpensyncAPInetState inetState) {
|
||||
LOG.debug("Entering parseRawDataToWiredPortStatus for Customer {}, Equipment {} with inetState {}",
|
||||
customerId, equipmentId, inetState);
|
||||
List<WiredPortStatus> ports = new ArrayList<>();
|
||||
inetState.ethPorts.forEach((key, ethPort) -> {
|
||||
try {
|
||||
// Raw data from AP example: ethPorts={eth1=up wan 1000Mbps full}
|
||||
String[] ethPortsValues = ethPort.split(SPACE_SEPERATOR);
|
||||
List<Integer> allowedVlans = getAllowedVlans(inetState.getVlanTrunk());
|
||||
@Override
|
||||
public void wifiInetStateDbTableDelete(List<OpensyncAPInetState> inetStateTables, String apId) {
|
||||
|
||||
if (ethPortsValues.length == 4 && inetState.getIfType() != null) {
|
||||
int speed = Integer.parseInt(ethPortsValues[2].replaceAll("[^0-9]", ""));
|
||||
boolean isTrunkEnabled = VLAN_TRUNK_IF_TYPE.equalsIgnoreCase(inetState.getIfType());
|
||||
LOG.debug("Received Wifi_Inet_State table delete for AP {}", apId);
|
||||
|
||||
int vlanId = inetState.getVlanId();
|
||||
if (isTrunkEnabled) {
|
||||
vlanId = getNativeVlanIdForTrunk(inetState.getVlanTrunk());
|
||||
}
|
||||
|
||||
WiredPortStatus wps = new WiredPortStatus(key, ethPortsValues[1], inetState.getIfName(),
|
||||
inetState.getIfType(), speed, ethPortsValues[3], ethPortsValues[0], vlanId,
|
||||
isTrunkEnabled, allowedVlans);
|
||||
|
||||
ports.add(wps);
|
||||
} else {
|
||||
LOG.error("EthPorts doesn't have enough raw data for CustomerId {} or EquipmentId {}", customerId,
|
||||
equipmentId);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOG.error("CustomerId {} or EquipmentId {} has error when parsing raw data to WiredPortStatus: {}",
|
||||
customerId, equipmentId, e);
|
||||
}
|
||||
});
|
||||
addToPortStatus(portStatus, inetState.getIfName(), ports);
|
||||
}
|
||||
|
||||
// Raw data from AP example: ["allowed_vlans": " 100 200 300 "]
|
||||
// convert to List of Integer
|
||||
private List<Integer> getAllowedVlans(Map<String, String> vlanTrunk) {
|
||||
List<Integer> allowedVlans = new ArrayList<>();
|
||||
try {
|
||||
if (!vlanTrunk.isEmpty() && vlanTrunk.get(ALLOWED_VLANS) != null
|
||||
&& !Objects.equals(vlanTrunk.get(ALLOWED_VLANS), "")) {
|
||||
List<String> allowedVlansStringList = Arrays.asList(vlanTrunk.get(ALLOWED_VLANS).trim().split("\\s+"));
|
||||
for (String allowedVlan : allowedVlansStringList) {
|
||||
allowedVlans.add(Integer.parseInt(allowedVlan));
|
||||
}
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
LOG.error("Unable to parse the allowed vlans from the vlanTrunk. Returning empty AllowedVlanList", ex);
|
||||
}
|
||||
LOG.debug("Returning allowed Vlans {}", allowedVlans);
|
||||
return allowedVlans;
|
||||
}
|
||||
|
||||
private int getNativeVlanIdForTrunk(Map<String, String> vlanTrunk) {
|
||||
int nativeVlanId = 0;
|
||||
if (!vlanTrunk.isEmpty() && vlanTrunk.get(NATIVE_VLAN_ID) != null &&
|
||||
!Objects.equals(vlanTrunk.get(NATIVE_VLAN_ID), "")) {
|
||||
nativeVlanId = Integer.parseInt(vlanTrunk.get(NATIVE_VLAN_ID));
|
||||
}
|
||||
return nativeVlanId;
|
||||
}
|
||||
|
||||
private void addToPortStatus(Map<String, List<WiredPortStatus>> portStatus, String ifName,
|
||||
List<WiredPortStatus> ports) {
|
||||
portStatus.put(ifName, ports);
|
||||
LOG.debug("Returning addToPortStatus with portStatus {}", portStatus);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wifiInetStateDbTableDelete(List<OpensyncAPInetState> inetStateTables, String apId) {
|
||||
|
||||
LOG.debug("Received Wifi_Inet_State table delete for AP {}", apId);
|
||||
|
||||
OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
|
||||
|
||||
if (ovsdbSession == null) {
|
||||
LOG.debug("wifiInetStateDbTableDelete::Cannot get Session for AP {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
if (ce == null) {
|
||||
LOG.debug("wifiInetStateDbTableDelete Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("wifiInetStateDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}",
|
||||
customerId, equipmentId, apId);
|
||||
return;
|
||||
}
|
||||
|
||||
Status ethernetPortStatus = statusServiceInterface.getOrNull(customerId, equipmentId,
|
||||
StatusDataType.WIRED_ETHERNET_PORT);
|
||||
if (ethernetPortStatus != null) {
|
||||
WiredEthernetPortStatusData ethernetPortStatusData = (WiredEthernetPortStatusData) ethernetPortStatus
|
||||
.getDetails();
|
||||
Map<String, List<WiredPortStatus>> portStatus = ethernetPortStatusData.getInterfacePortStatusMap();
|
||||
|
||||
for (OpensyncAPInetState inetState : inetStateTables) {
|
||||
|
||||
portStatus.remove(inetState.getIfName());
|
||||
ethernetPortStatusData.setInterfacePortStatusMap(portStatus);
|
||||
ethernetPortStatus.setDetails(ethernetPortStatusData);
|
||||
ethernetPortStatus = statusServiceInterface.update(ethernetPortStatus);
|
||||
LOG.debug("Deleted ifName {} from the AP {}. EthernetPortStatus after deletion{}",
|
||||
inetState.getIfName(), apId, ethernetPortStatus);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wifiAssociatedClientsDbTableUpdate(List<OpensyncWifiAssociatedClients> wifiAssociatedClients, String apId) {
|
||||
|
||||
@@ -1752,12 +1557,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get Session for AP {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
|
||||
if (ce == null) {
|
||||
LOG.debug("wifiAssociatedClientsDbTableUpdate Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("wifiAssociatedClientsDbTableUpdate::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
@@ -1780,13 +1588,17 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
MacAddress macAddress = MacAddress.valueOf(mMac);
|
||||
|
||||
Client clientInstance = clientServiceInterface.getOrNull(customerId, macAddress);
|
||||
boolean isReassociation = true;
|
||||
if (clientInstance == null) {
|
||||
|
||||
isReassociation = false; // new client
|
||||
|
||||
clientInstance = new Client();
|
||||
clientInstance.setCustomerId(customerId);
|
||||
clientInstance.setMacAddress(MacAddress.valueOf(mMac));
|
||||
clientInstance.setCreatedTimestamp(System.currentTimeMillis());
|
||||
clientInstance.setDetails(new ClientInfoDetails());
|
||||
clientInstance = clientServiceInterface.create(clientInstance);
|
||||
|
||||
LOG.info("Created client from Wifi_Associated_Clients ovsdb table change {}", clientInstance);
|
||||
}
|
||||
|
||||
@@ -1798,20 +1610,30 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
clientSession.setMacAddress(clientInstance.getMacAddress());
|
||||
clientSession.setLocationId(ce.getLocationId());
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
long derivedSessionId = WiFiSessionUtility.encodeWiFiAssociationId(timestamp / 1000, clientInstance.getMacAddress().getAddressAsLong());
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(derivedSessionId));
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(derivedSessionId)));
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong()));
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(clientInstance.getMacAddress().getAddressAsLong())));
|
||||
clientSession.getDetails().setMetricDetails(new ClientSessionMetricDetails());
|
||||
clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
|
||||
clientSession.getDetails().setIsReassociation(false);
|
||||
clientSession.getDetails().setAssocTimestamp(timestamp);
|
||||
clientSessions.add(clientSession);
|
||||
} else {
|
||||
if (clientSession.getDetails().getPriorEquipmentId() == null) {
|
||||
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
|
||||
}
|
||||
if (clientSession.getDetails().getPriorSessionId() == null) {
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
if (clientSession.getDetails().getLastEventTimestamp() == null || clientSession.getDetails().getLastEventTimestamp() < timestamp) {
|
||||
clientSession.getDetails().setLastEventTimestamp(timestamp);
|
||||
}
|
||||
if (!clientSession.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
|
||||
clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
|
||||
clientSession.getDetails().setAssocTimestamp(timestamp);
|
||||
clientSessions.add(clientSession);
|
||||
}
|
||||
}
|
||||
clientSession.getDetails().setIsReassociation(isReassociation);
|
||||
|
||||
clientSessions.add(clientSession);
|
||||
|
||||
}
|
||||
|
||||
if (clientSessions.size() > 0) {
|
||||
@@ -2060,12 +1882,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
LOG.debug("wifiVIFStateDbTableDelete::Cannot get Session for AP {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
if (ce == null) {
|
||||
LOG.debug("wifiVIFStateDbTableDelete Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
@@ -2123,13 +1942,9 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
}
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
if (ce == null) {
|
||||
LOG.debug("wifiAssociatedClientsDbTableDelete Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("wifiAssociatedClientsDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
LOG.debug("wifiVIFStateDbTableDelete::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
return;
|
||||
}
|
||||
Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(deletedClientMac));
|
||||
@@ -2167,11 +1982,11 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getByInventoryIdOrNull(apId);
|
||||
int customerId = ce.getCustomerId();
|
||||
if (ce == null) {
|
||||
LOG.debug("updateDhcpIpClientFingerprints::Cannot get Equipment for AP {}", apId);
|
||||
return;
|
||||
}
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("updateDhcpIpClientFingerprints::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
return;
|
||||
@@ -2264,6 +2079,15 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
if (clientServiceInterface.getOrNull(customerId, clientMacAddress) != null) {
|
||||
LOG.info("Deleting invalid client {}", clientServiceInterface.delete(customerId, clientMacAddress));
|
||||
}
|
||||
} else {
|
||||
LOG.info("Client {} already exists on the cloud, delete the session for the client if it exists", dhcpLeasedIps);
|
||||
// In this case, we might have a session, as the client
|
||||
// already exists on the cloud, update if required
|
||||
ClientSession session = clientServiceInterface.getSessionOrNull(customerId, equipmentId, clientMacAddress);
|
||||
if (session != null) {
|
||||
LOG.info("Delete clientSession that was removed from the Dhcp_Leased_IP table {}",
|
||||
clientServiceInterface.deleteSession(customerId, equipmentId, clientMacAddress));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2278,8 +2102,21 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
if (session == null) {
|
||||
LOG.info("No session for client {} with for customer {} equipment {}", clientMacAddress, customerId, equipmentId);
|
||||
return null;
|
||||
} else {
|
||||
if (session.getDetails().getPriorEquipmentId() == null) {
|
||||
session.getDetails().setPriorEquipmentId(session.getEquipmentId());
|
||||
}
|
||||
if (session.getDetails().getPriorSessionId() == null) {
|
||||
session.getDetails().setPriorSessionId(session.getDetails().getSessionId());
|
||||
}
|
||||
if (session.getDetails().getLastEventTimestamp() == null || session.getDetails().getLastEventTimestamp() < timestamp) {
|
||||
session.getDetails().setLastEventTimestamp(timestamp);
|
||||
}
|
||||
if (!session.getDetails().getAssociationState().equals(AssociationState._802_11_Associated)) {
|
||||
session.getDetails().setAssociationState(AssociationState._802_11_Associated);
|
||||
session.getDetails().setAssocTimestamp(timestamp);
|
||||
}
|
||||
}
|
||||
|
||||
if (dhcpLeasedIps.containsKey("fingerprint")) {
|
||||
session.getDetails().setApFingerprint(dhcpLeasedIps.get("fingerprint"));
|
||||
}
|
||||
@@ -2334,7 +2171,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
if (dhcpLeasedIps.containsKey("lease_time")) {
|
||||
Integer leaseTime = Integer.valueOf(dhcpLeasedIps.get("lease_time"));
|
||||
session.getDetails().getDhcpDetails().setLeaseTimeInSeconds(leaseTime);
|
||||
session.getDetails().getDhcpDetails().setLeaseStartTimestamp(session.getDetails().getAssocTimestamp());
|
||||
}
|
||||
|
||||
if (dhcpLeasedIps.containsKey("gateway")) {
|
||||
@@ -2433,83 +2269,6 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
// TODO: will handle changes from Command_State table
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getConfigVersionFromStatus(String apId) {
|
||||
long ret = 0;
|
||||
|
||||
OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
|
||||
|
||||
if (ovsdbSession == null) {
|
||||
LOG.debug("getConfigVersionFromStatus::Cannot get Session for AP {}", apId);
|
||||
return ret;
|
||||
}
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
if (ce == null) {
|
||||
LOG.debug("getConfigVersionFromStatus Cannot get customer Equipment for {}", apId);
|
||||
return ret;
|
||||
}
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("getConfigVersionFromStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
return ret;
|
||||
}
|
||||
|
||||
Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
|
||||
if(protocolStatus != null) {
|
||||
EquipmentProtocolStatusData epsd = (EquipmentProtocolStatusData) protocolStatus.getDetails();
|
||||
if(epsd!=null && epsd.getReportedCfgDataVersion()!=null) {
|
||||
ret = epsd.getReportedCfgDataVersion();
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateConfigVersionInStatus(String apId, long configVersionFromProfiles) {
|
||||
OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
|
||||
|
||||
if (ovsdbSession == null) {
|
||||
LOG.debug("updateConfigVersionInStatus::Cannot get Session for AP {}", apId);
|
||||
return;
|
||||
}
|
||||
|
||||
long equipmentId = ovsdbSession.getEquipmentId();
|
||||
Equipment ce = equipmentServiceInterface.getOrNull(equipmentId);
|
||||
if (ce == null) {
|
||||
LOG.debug("updateConfigVersionInStatus Cannot get customer Equipment for {}", apId);
|
||||
return;
|
||||
}
|
||||
int customerId = ce.getCustomerId();
|
||||
if ((customerId < 0) || (equipmentId < 0)) {
|
||||
LOG.debug("updateConfigVersionInStatus::Cannot get valid CustomerId {} or EquipmentId {} for AP {}", customerId, equipmentId, apId);
|
||||
return;
|
||||
}
|
||||
|
||||
Status protocolStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.PROTOCOL);
|
||||
if(protocolStatus == null) {
|
||||
protocolStatus = new Status();
|
||||
protocolStatus.setCustomerId(customerId);
|
||||
protocolStatus.setEquipmentId(equipmentId);
|
||||
protocolStatus.setCreatedTimestamp(System.currentTimeMillis());
|
||||
protocolStatus.setLastModifiedTimestamp(protocolStatus.getCreatedTimestamp());
|
||||
protocolStatus.setDetails(new EquipmentProtocolStatusData());
|
||||
}
|
||||
|
||||
EquipmentProtocolStatusData epsd = (EquipmentProtocolStatusData) protocolStatus.getDetails();
|
||||
if(epsd==null) {
|
||||
epsd = new EquipmentProtocolStatusData();
|
||||
protocolStatus.setDetails(epsd);
|
||||
}
|
||||
|
||||
epsd.setReportedCfgDataVersion(configVersionFromProfiles);
|
||||
|
||||
statusServiceInterface.update(protocolStatus);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Clear the EquipmentStatus for this AP, and set all client sessions to
|
||||
* disconnected. Done as part of a reconfiguration/configuration change
|
||||
@@ -2654,7 +2413,7 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
ApcElectionEvent electionEvent =
|
||||
new ApcElectionEvent(drIpAddr, bdrIpAddr, localIpV4Addr, drIpAddr, mode, Boolean.valueOf(apcStateAttributes.get("enabled")),
|
||||
RealTimeEventType.APC_Election_event, customerId, ce.getLocationId(), equipmentId, System.currentTimeMillis());
|
||||
statsPublisherInterface.publishSystemEventFromTableStateMonitor(electionEvent);
|
||||
mqttMessageProcessor.publishSystemEventFromTableStateMonitor(electionEvent);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -2684,20 +2443,18 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
|
||||
Status eqAdminStatus = statusServiceInterface.getOrNull(customerId, equipmentId, StatusDataType.EQUIPMENT_ADMIN);
|
||||
|
||||
LedStatus ledStatus = null;
|
||||
for (Map<String, String> nsa : nodeStateAttributes) {
|
||||
if (nsa.get("module").equals("led")) {
|
||||
if (nsa.get("key").equals("led_state") && nsa.get("value").equals("on")) {
|
||||
ledStatus = LedStatus.led_on;
|
||||
} else if (nsa.get("key").equals("led_state") && nsa.get("value").equals("off")) {
|
||||
ledStatus = LedStatus.led_off;
|
||||
} else if (nsa.get("key").equals("led_blink")) {
|
||||
ledStatus = LedStatus.led_blink;
|
||||
} else {
|
||||
ledStatus = LedStatus.UNKNOWN;
|
||||
}
|
||||
}
|
||||
}
|
||||
LedStatus ledStatus = null;
|
||||
for (Map<String, String> nsa : nodeStateAttributes) {
|
||||
if (nsa.get("module").equals("led")) {
|
||||
if (nsa.get("key").equals("led_blink") && nsa.get("value").equals("on")) {
|
||||
ledStatus = LedStatus.led_blink;
|
||||
} else if (nsa.get("key").equals("led_off") && nsa.get("value").equals("off")) {
|
||||
ledStatus = LedStatus.led_off;
|
||||
} else {
|
||||
ledStatus = LedStatus.UNKNOWN;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ledStatus != null) {
|
||||
if (eqAdminStatus != null) {
|
||||
@@ -2713,9 +2470,4 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
|
||||
LOG.debug("finished nodeStateDbTableUpdate for {}", apId);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processMqttMessage(String topic, Report report) {
|
||||
statsPublisherInterface.processMqttMessage(topic, report);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ import org.springframework.security.web.bind.annotation.AuthenticationPrincipal;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMethod;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import com.telecominfraproject.wlan.core.client.PingClient;
|
||||
@@ -50,6 +51,7 @@ import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRebootRequest;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.CEGWRouteCheck;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStartDebugEngine;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.CEGWStopDebugEngine;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.CEGatewayCommand;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommand;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.EquipmentCommandResponse;
|
||||
import com.telecominfraproject.wlan.equipmentgateway.models.GatewayDefaults;
|
||||
@@ -207,9 +209,9 @@ public class OpensyncCloudGatewayController {
|
||||
case CellSizeAttributesRequest:
|
||||
ret.add(sendCellSizeRequest(session, (CEGWCellSizeAttributesRequest) command));
|
||||
break;
|
||||
// case MostRecentStatsTimestamp:
|
||||
// ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
|
||||
// break;
|
||||
case MostRecentStatsTimestamp:
|
||||
ret.add(sendGetMostRecentStatsTimestampRequest(command, inventoryId));
|
||||
break;
|
||||
default:
|
||||
LOG.warn("[{}] Failed to deliver command {}, unsupported command type", inventoryId, command);
|
||||
ret.add(new EquipmentCommandResponse(CEGWCommandResultCode.UnsupportedCommand,
|
||||
@@ -248,7 +250,32 @@ public class OpensyncCloudGatewayController {
|
||||
return new GatewayDefaults();
|
||||
}
|
||||
|
||||
|
||||
private EquipmentCommandResponse sendGetMostRecentStatsTimestampRequest(CEGWBaseCommand command, String inventoryId) {
|
||||
Long ts = lastReceivedStatsTimestamp(inventoryId);
|
||||
if (ts == null) {
|
||||
return new EquipmentCommandResponse(CEGWCommandResultCode.NoRouteToCE,
|
||||
null, command,
|
||||
registeredGateway == null ? null : registeredGateway.getHostname(),
|
||||
registeredGateway == null ? -1 : registeredGateway.getPort());
|
||||
} else {
|
||||
return new EquipmentCommandResponse(CEGWCommandResultCode.Success,
|
||||
ts.toString(), command,
|
||||
registeredGateway == null ? null : registeredGateway.getHostname(),
|
||||
registeredGateway == null ? -1 : registeredGateway.getPort());
|
||||
}
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/lastReceivedStatsTimestamp", method = RequestMethod.GET)
|
||||
public Long lastReceivedStatsTimestamp(@RequestParam String apId) {
|
||||
Long ret = null;
|
||||
if (ovsdbSessionMapInterface.getSession(apId) != null) {
|
||||
ret = ovsdbSessionMapInterface.getSession(apId).getMostRecentStatsTimestamp();
|
||||
LOG.debug("lastReceivedStatsTimestamp for apId {} {}",apId,ret);
|
||||
} else {
|
||||
LOG.warn("lastReceivedStatsTimestamp found no session for {}, cannot get timestamp",apId);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Verify a route to customer equipment
|
||||
|
||||
@@ -1,365 +0,0 @@
|
||||
package com.telecominfraproject.wlan.opensync.external.integration.utils;
|
||||
|
||||
import java.net.Inet4Address;
|
||||
import java.net.Inet6Address;
|
||||
import java.net.InetAddress;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.protobuf.ByteString;
|
||||
import com.telecominfraproject.wlan.client.ClientServiceInterface;
|
||||
import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
|
||||
import com.telecominfraproject.wlan.client.session.models.AssociationState;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientDhcpDetails;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSession;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
|
||||
import com.telecominfraproject.wlan.servicemetric.models.ServiceMetric;
|
||||
|
||||
import sts.OpensyncStats.AssocType;
|
||||
import sts.OpensyncStats.DeviceType;
|
||||
import sts.OpensyncStats.EventReport;
|
||||
import sts.OpensyncStats.FrameType;
|
||||
import sts.OpensyncStats.Report;
|
||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientAuthEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientIpEvent;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/***
|
||||
* MqttStatsPublisher will use this class to publish Stats and Events asynchronously.
|
||||
* We use async to decrease the processing time for the gateway.
|
||||
*
|
||||
* Note: @Async only applies on public method and cannot have self-invocation (i.e. cannot
|
||||
* calling the async method from within the same class)
|
||||
*/
|
||||
@Service
|
||||
public class AsyncPublishService {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(MqttStatsPublisher.class);
|
||||
|
||||
@Autowired
|
||||
private CloudEventDispatcherInterface cloudEventDispatcherInterface;
|
||||
|
||||
@Autowired
|
||||
private RealtimeEventPublisher realtimeEventPublisher;
|
||||
|
||||
@Autowired
|
||||
private ClientServiceInterface clientServiceInterface;
|
||||
|
||||
|
||||
@Async
|
||||
public void asyncPublishStats(String apId, List<ServiceMetric> metricRecordList) {
|
||||
try {
|
||||
long publishStart = System.nanoTime();
|
||||
cloudEventDispatcherInterface.publishMetrics(metricRecordList);
|
||||
long publishStop = System.nanoTime();
|
||||
if (LOG.isDebugEnabled())
|
||||
LOG.debug("Elapsed publishing time for metrics records from AP {} is {} milliseconds", apId,
|
||||
TimeUnit.MILLISECONDS.convert(publishStop - publishStart, TimeUnit.NANOSECONDS));
|
||||
} catch (Exception e) {
|
||||
LOG.error("Exception when trying to publishServiceMetrics.", e);
|
||||
}
|
||||
}
|
||||
|
||||
@Async
|
||||
public void asyncPublishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
|
||||
try {
|
||||
long mqttEventsStart = System.nanoTime();
|
||||
publishEvents(report, customerId, equipmentId, apId, locationId);
|
||||
long mqttEventsStop = System.nanoTime();
|
||||
if (LOG.isDebugEnabled())
|
||||
LOG.debug("Elapsed publishing time for mqtt events from AP {} is {} milliseconds", apId,
|
||||
TimeUnit.MILLISECONDS.convert(mqttEventsStop - mqttEventsStart, TimeUnit.NANOSECONDS));
|
||||
} catch (Exception e) {
|
||||
LOG.error("Exception when trying to publishEvents.", e);
|
||||
}
|
||||
}
|
||||
|
||||
void publishEvents(Report report, int customerId, long equipmentId, String apId, long locationId) {
|
||||
|
||||
realtimeEventPublisher.publishSipCallEvents(customerId, equipmentId, locationId, report.getVideoVoiceReportList());
|
||||
|
||||
for (EventReport eventReport : report.getEventReportList()) {
|
||||
|
||||
for (sts.OpensyncStats.EventReport.ClientSession apEventClientSession : eventReport.getClientSessionList()) {
|
||||
|
||||
LOG.debug("Processing EventReport::ClientSession for AP {}", apId);
|
||||
// for the following MQTT events, the client/client session is first updated, then the real time event
|
||||
// is published.
|
||||
if (apEventClientSession.hasClientAuthEvent()) {
|
||||
processClientAuthEvent(customerId, equipmentId, locationId, apEventClientSession);
|
||||
}
|
||||
if (apEventClientSession.hasClientAssocEvent()) {
|
||||
processClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession);
|
||||
}
|
||||
if (apEventClientSession.hasClientIpEvent()) {
|
||||
processClientIpEvent(customerId, equipmentId, locationId, apEventClientSession);
|
||||
}
|
||||
if (apEventClientSession.hasClientDisconnectEvent()) {
|
||||
processClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession);
|
||||
}
|
||||
}
|
||||
realtimeEventPublisher.publishChannelHopEvents(customerId, equipmentId, locationId, eventReport);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void processClientAuthEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
|
||||
ClientAuthEvent apClientEvent = apEventClientSession.getClientAuthEvent();
|
||||
com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
|
||||
if (client == null) {
|
||||
client = new com.telecominfraproject.wlan.client.models.Client();
|
||||
client.setCustomerId(customerId);
|
||||
client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
client.setDetails(new ClientInfoDetails());
|
||||
client = clientServiceInterface.create(client);
|
||||
}
|
||||
|
||||
ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
|
||||
if (clientSession == null) {
|
||||
clientSession = new ClientSession();
|
||||
clientSession.setCustomerId(customerId);
|
||||
clientSession.setEquipmentId(equipmentId);
|
||||
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
clientSession.setLocationId(locationId);
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
|
||||
}
|
||||
if (clientSession.getDetails().getPriorEquipmentId() == null) {
|
||||
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
|
||||
}
|
||||
if (clientSession.getDetails().getPriorSessionId() == null) {
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
|
||||
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
|
||||
clientSession.getDetails().setSsid(apClientEvent.getSsid());
|
||||
if (apClientEvent.hasAuthStatus()) {
|
||||
clientSession.getDetails().setAssociationStatus(apClientEvent.getAuthStatus());
|
||||
}
|
||||
clientSession.getDetails().setAuthTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession.getDetails().setAssociationState(AssociationState._802_11_Authenticated);
|
||||
clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession = clientServiceInterface.updateSession(clientSession);
|
||||
|
||||
realtimeEventPublisher.publishClientAuthSystemEvent(customerId, equipmentId, locationId, apEventClientSession.getClientAuthEvent());
|
||||
|
||||
}
|
||||
|
||||
private void processClientAssocEvent(int customerId, long equipmentId, long locationId,
|
||||
sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
|
||||
ClientAssocEvent apClientEvent = apEventClientSession.getClientAssocEvent();
|
||||
|
||||
com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
|
||||
if (client == null) {
|
||||
client = new com.telecominfraproject.wlan.client.models.Client();
|
||||
client.setCustomerId(customerId);
|
||||
client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
client.setDetails(new ClientInfoDetails());
|
||||
client = clientServiceInterface.create(client);
|
||||
}
|
||||
|
||||
ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
|
||||
if (clientSession == null) {
|
||||
clientSession = new ClientSession();
|
||||
clientSession.setCustomerId(customerId);
|
||||
clientSession.setEquipmentId(equipmentId);
|
||||
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
clientSession.setLocationId(locationId);
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
|
||||
}
|
||||
if (clientSession.getDetails().getPriorEquipmentId() == null) {
|
||||
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
|
||||
}
|
||||
if (clientSession.getDetails().getPriorSessionId() == null) {
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
|
||||
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
|
||||
clientSession.getDetails().setSsid(apClientEvent.getSsid());
|
||||
if (apClientEvent.hasStatus()) {
|
||||
clientSession.getDetails().setAssociationStatus(apClientEvent.getStatus());
|
||||
}
|
||||
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
|
||||
if (apClientEvent.hasUsing11K()) {
|
||||
clientSession.getDetails().setIs11KUsed(apClientEvent.getUsing11K());
|
||||
}
|
||||
if (apClientEvent.hasUsing11R()) {
|
||||
clientSession.getDetails().setIs11RUsed(apClientEvent.getUsing11R());
|
||||
}
|
||||
if (apClientEvent.hasUsing11V()) {
|
||||
clientSession.getDetails().setIs11VUsed(apClientEvent.getUsing11V());
|
||||
}
|
||||
if (apClientEvent.hasAssocType()) {
|
||||
clientSession.getDetails().setIsReassociation(apClientEvent.getAssocType().equals(AssocType.REASSOC));
|
||||
}
|
||||
if (apClientEvent.hasRssi()) {
|
||||
clientSession.getDetails().setAssocRssi(apClientEvent.getRssi());
|
||||
}
|
||||
if (apClientEvent.hasInternalSc()) {
|
||||
clientSession.getDetails().setAssocInternalSC(apClientEvent.getInternalSc());
|
||||
}
|
||||
clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession.getDetails().setAssociationState(AssociationState._802_11_Associated);
|
||||
clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession = clientServiceInterface.updateSession(clientSession);
|
||||
realtimeEventPublisher.publishClientAssocEvent(customerId, equipmentId, locationId, apEventClientSession.getClientAssocEvent());
|
||||
|
||||
}
|
||||
|
||||
private void processClientIpEvent(int customerId, long equipmentId, long locationId, sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
|
||||
ClientIpEvent apClientEvent = apEventClientSession.getClientIpEvent();
|
||||
com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
if (client == null) {
|
||||
client = new com.telecominfraproject.wlan.client.models.Client();
|
||||
client.setCustomerId(customerId);
|
||||
client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
client.setDetails(new ClientInfoDetails());
|
||||
client = clientServiceInterface.create(client);
|
||||
}
|
||||
client = clientServiceInterface.update(client);
|
||||
|
||||
ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
if (clientSession == null) {
|
||||
clientSession = new ClientSession();
|
||||
clientSession.setCustomerId(customerId);
|
||||
clientSession.setEquipmentId(equipmentId);
|
||||
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
clientSession.setLocationId(locationId);
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
|
||||
}
|
||||
if (clientSession.getDetails().getPriorEquipmentId() == null) {
|
||||
clientSession.getDetails().setPriorEquipmentId(clientSession.getEquipmentId());
|
||||
}
|
||||
if (clientSession.getDetails().getPriorSessionId() == null) {
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
|
||||
if (apClientEvent.hasIpAddr()) {
|
||||
ByteString ipAddress = apClientEvent.getIpAddr();
|
||||
if (ipAddress != null) {
|
||||
try {
|
||||
InetAddress inetAddress = InetAddress.getByAddress(ipAddress.toByteArray());
|
||||
if (inetAddress instanceof Inet4Address) {
|
||||
clientSession.getDetails().setIpAddress(inetAddress);
|
||||
} else if (inetAddress instanceof Inet6Address) {
|
||||
clientSession.getDetails().setIpAddress(inetAddress);
|
||||
} else {
|
||||
LOG.error("Invalid IP Address {}", ipAddress);
|
||||
}
|
||||
clientSession.getDetails().setIpTimestamp(apClientEvent.getTimestampMs());
|
||||
|
||||
} catch (UnknownHostException ex) {
|
||||
}
|
||||
}
|
||||
}
|
||||
clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession = clientServiceInterface.updateSession(clientSession);
|
||||
realtimeEventPublisher.publishClientIpEvent(customerId, equipmentId, locationId, apEventClientSession.getClientIpEvent());
|
||||
}
|
||||
|
||||
private void processClientDisconnectEvent(int customerId, long equipmentId, long locationId,
|
||||
sts.OpensyncStats.EventReport.ClientSession apEventClientSession) {
|
||||
ClientDisconnectEvent apClientEvent = apEventClientSession.getClientDisconnectEvent();
|
||||
com.telecominfraproject.wlan.client.models.Client client = clientServiceInterface.getOrNull(customerId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
if (client == null) {
|
||||
client = new com.telecominfraproject.wlan.client.models.Client();
|
||||
client.setCustomerId(customerId);
|
||||
client.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
client.setDetails(new ClientInfoDetails());
|
||||
client = clientServiceInterface.create(client);
|
||||
}
|
||||
ClientSession clientSession = clientServiceInterface.getSessionOrNull(customerId, equipmentId, MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
if (clientSession == null) {
|
||||
clientSession = new ClientSession();
|
||||
clientSession.setCustomerId(customerId);
|
||||
clientSession.setEquipmentId(equipmentId);
|
||||
clientSession.setMacAddress(MacAddress.valueOf(apClientEvent.getStaMac()));
|
||||
clientSession.setLocationId(locationId);
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
clientSession.getDetails().setDhcpDetails(new ClientDhcpDetails(Long.toUnsignedString(apEventClientSession.getSessionId())));
|
||||
}
|
||||
|
||||
if (clientSession.getDetails().getPriorSessionId() == null) {
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId())))
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
if (!Objects.equal(clientSession.getDetails().getSessionId(), Long.toUnsignedString(apEventClientSession.getSessionId()))) {
|
||||
clientSession.getDetails().setPriorSessionId(clientSession.getDetails().getSessionId());
|
||||
}
|
||||
clientSession.getDetails().setSessionId(Long.toUnsignedString(apEventClientSession.getSessionId()));
|
||||
clientSession.getDetails().setRadioType(OvsdbToWlanCloudTypeMappingUtility.getRadioTypeFromOpensyncStatsRadioBandType(apClientEvent.getBand()));
|
||||
clientSession.getDetails().setSsid(apClientEvent.getSsid());
|
||||
if (apClientEvent.hasDevType()) {
|
||||
if (apClientEvent.getDevType().equals(DeviceType.DEV_AP)) {
|
||||
clientSession.getDetails().setDisconnectByApTimestamp(apClientEvent.getTimestampMs());
|
||||
if (apClientEvent.hasInternalRc()) {
|
||||
clientSession.getDetails().setDisconnectByApInternalReasonCode(apClientEvent.getInternalRc());
|
||||
}
|
||||
if (apClientEvent.hasReason()) {
|
||||
clientSession.getDetails().setDisconnectByApReasonCode(apClientEvent.getReason());
|
||||
}
|
||||
} else {
|
||||
clientSession.getDetails().setDisconnectByClientTimestamp(apClientEvent.getTimestampMs());
|
||||
if (apClientEvent.hasInternalRc()) {
|
||||
clientSession.getDetails().setDisconnectByClientInternalReasonCode(apClientEvent.getInternalRc());
|
||||
}
|
||||
if (apClientEvent.hasReason()) {
|
||||
clientSession.getDetails().setDisconnectByClientReasonCode(apClientEvent.getReason());
|
||||
}
|
||||
}
|
||||
}
|
||||
if (apClientEvent.hasFrType()) {
|
||||
if (apClientEvent.getFrType().equals(FrameType.FT_DEAUTH)) {
|
||||
}
|
||||
if (apClientEvent.getFrType().equals(FrameType.FT_DISASSOC)) {
|
||||
}
|
||||
}
|
||||
if (apClientEvent.hasRssi()) {
|
||||
clientSession.getDetails().setAssocRssi(apClientEvent.getRssi());
|
||||
}
|
||||
if (apClientEvent.hasLrcvUpTsInUs()) {
|
||||
clientSession.getDetails().setLastRxTimestamp(apClientEvent.getLrcvUpTsInUs());
|
||||
}
|
||||
if (apClientEvent.hasLsentUpTsInUs()) {
|
||||
clientSession.getDetails().setLastTxTimestamp(apClientEvent.getLsentUpTsInUs());
|
||||
}
|
||||
clientSession.getDetails().setAssociationState(AssociationState.Disconnected);
|
||||
clientSession.getDetails().setAssocTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession.getDetails().setLastEventTimestamp(apClientEvent.getTimestampMs());
|
||||
clientSession = clientServiceInterface.updateSession(clientSession);
|
||||
realtimeEventPublisher.publishClientDisconnectEvent(customerId, equipmentId, locationId, apEventClientSession.getClientDisconnectEvent());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,10 +8,13 @@ import java.util.List;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientConnectSuccessEvent;
|
||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectFrameType;
|
||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientDisconnectEvent.DisconnectInitiator;
|
||||
import com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent.ClientTimeoutReason;
|
||||
import com.telecominfraproject.wlan.client.models.events.utils.WlanReasonCode;
|
||||
import com.telecominfraproject.wlan.client.models.events.utils.WlanStatusCode;
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
|
||||
@@ -26,6 +29,7 @@ import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
|
||||
import com.telecominfraproject.wlan.profile.models.ProfileContainer;
|
||||
import com.telecominfraproject.wlan.profile.models.ProfileType;
|
||||
import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.BaseDhcpEvent;
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeChannelHopEvent;
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeEventType;
|
||||
import com.telecominfraproject.wlan.systemevent.equipment.realtime.RealTimeSipCallReportEvent;
|
||||
@@ -40,6 +44,7 @@ import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
|
||||
|
||||
import sts.OpensyncStats;
|
||||
import sts.OpensyncStats.AssocType;
|
||||
import sts.OpensyncStats.CTReasonType;
|
||||
import sts.OpensyncStats.CallReport;
|
||||
import sts.OpensyncStats.CallStart;
|
||||
import sts.OpensyncStats.CallStop;
|
||||
@@ -48,8 +53,22 @@ import sts.OpensyncStats.DeviceType;
|
||||
import sts.OpensyncStats.EventReport;
|
||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientAuthEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientConnectEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientDisconnectEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientFailureEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientFirstDataEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientIdEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientIpEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientTimeoutEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpAckEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpCommonData;
|
||||
import sts.OpensyncStats.EventReport.DhcpDeclineEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpDiscoverEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpInformEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpNakEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpOfferEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpRequestEvent;
|
||||
import sts.OpensyncStats.EventReport.DhcpTransaction;
|
||||
import sts.OpensyncStats.FrameType;
|
||||
import sts.OpensyncStats.RtpFlowStats;
|
||||
import sts.OpensyncStats.StreamingVideoServerDetected;
|
||||
@@ -72,7 +91,7 @@ public class RealtimeEventPublisher {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(RealtimeEventPublisher.class);
|
||||
|
||||
|
||||
@Async
|
||||
void publishChannelHopEvents(int customerId, long equipmentId, long locationId, EventReport e) {
|
||||
|
||||
LOG.info("publishChannelHopEvents for customerId {} equipmentId {}");
|
||||
@@ -161,8 +180,96 @@ public class RealtimeEventPublisher {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Async
|
||||
void publishClientConnectSuccessEvent(int customerId, long equipmentId, long locationId, ClientConnectEvent clientConnectEvent) {
|
||||
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientConnectEvent, customerId,
|
||||
equipmentId);
|
||||
ClientConnectSuccessEvent clientEvent = new ClientConnectSuccessEvent(clientConnectEvent.getTimestampMs());
|
||||
clientEvent.setClientMacAddress(MacAddress.valueOf(clientConnectEvent.getStaMac()));
|
||||
clientEvent.setRadioType(OvsdbToWlanCloudTypeMappingUtility
|
||||
.getRadioTypeFromOpensyncStatsRadioBandType(clientConnectEvent.getBand()));
|
||||
clientEvent.setSsid(clientConnectEvent.getSsid());
|
||||
clientEvent.setSessionId(Long.toUnsignedString( clientConnectEvent.getSessionId()));
|
||||
|
||||
if (clientConnectEvent.hasFbtUsed()) {
|
||||
clientEvent.setFbtUsed(clientConnectEvent.getFbtUsed());
|
||||
}
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsAssoc()) {
|
||||
clientEvent.setAssocTs(clientConnectEvent.getEvTimeBootupInUsAssoc());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsAuth()) {
|
||||
clientEvent.setAuthTs(clientConnectEvent.getEvTimeBootupInUsAuth());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsEapol()) {
|
||||
clientEvent.setEapolTs(clientConnectEvent.getEvTimeBootupInUsEapol());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsFirstRx()) {
|
||||
clientEvent.setFirstDataRxTs(clientConnectEvent.getEvTimeBootupInUsFirstRx());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsFirstTx()) {
|
||||
clientEvent.setFirstDataTxTs(clientConnectEvent.getEvTimeBootupInUsFirstTx());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsIp()) {
|
||||
clientEvent.setIpAcquisitionTs(clientConnectEvent.getEvTimeBootupInUsIp());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasEvTimeBootupInUsPortEnable()) {
|
||||
clientEvent.setPortEnabledTs(clientConnectEvent.getEvTimeBootupInUsPortEnable());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasCltId()) {
|
||||
clientEvent.setHostName(clientConnectEvent.getCltId());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasSecType()) {
|
||||
clientEvent.setSecurityType(OvsdbToWlanCloudTypeMappingUtility
|
||||
.getCloudSecurityTypeFromOpensyncStats(clientConnectEvent.getSecType()));
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasAssocType()) {
|
||||
clientEvent.setReassociation(clientConnectEvent.getAssocType().equals(AssocType.REASSOC));
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasAssocRssi()) {
|
||||
clientEvent.setAssocRSSI(clientConnectEvent.getAssocRssi());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasUsing11K()) {
|
||||
clientEvent.setUsing11k(clientConnectEvent.getUsing11K());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasUsing11R()) {
|
||||
clientEvent.setUsing11r(clientConnectEvent.getUsing11R());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasUsing11V()) {
|
||||
clientEvent.setUsing11v(clientConnectEvent.getUsing11V());
|
||||
}
|
||||
|
||||
if (clientConnectEvent.hasIpAddr()) {
|
||||
try {
|
||||
clientEvent.setIpAddr(InetAddress.getByAddress(clientConnectEvent.getIpAddr().toByteArray()));
|
||||
|
||||
} catch (UnknownHostException e1) {
|
||||
LOG.error("Invalid Ip Address for client {}", clientConnectEvent.getIpAddr(), e1);
|
||||
}
|
||||
}
|
||||
clientEvent.setEventTimestamp(clientConnectEvent.getTimestampMs());
|
||||
clientEvent.setCustomerId(customerId);
|
||||
clientEvent.setEquipmentId(equipmentId);
|
||||
clientEvent.setLocationId(locationId);
|
||||
|
||||
LOG.info("Publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
|
||||
}
|
||||
@Async
|
||||
void publishClientDisconnectEvent(int customerId, long equipmentId, long locationId, ClientDisconnectEvent clientDisconnectEvent) {
|
||||
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientDisconnectEvent, customerId,
|
||||
@@ -213,6 +320,7 @@ public class RealtimeEventPublisher {
|
||||
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishClientAuthSystemEvent(int customerId, long equipmentId, long locationId, ClientAuthEvent clientAuthEvent) {
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAuthEvent, customerId, equipmentId);
|
||||
|
||||
@@ -237,6 +345,7 @@ public class RealtimeEventPublisher {
|
||||
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishClientAssocEvent(int customerId, long equipmentId, long locationId, ClientAssocEvent clientAssocEvent) {
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientAssocEvent, customerId, equipmentId);
|
||||
|
||||
@@ -286,7 +395,82 @@ public class RealtimeEventPublisher {
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishClientFailureEvent(int customerId, long equipmentId, long locationId, ClientFailureEvent clientFailureEvent) {
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFailureEvent, customerId,
|
||||
equipmentId);
|
||||
|
||||
com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFailureEvent(
|
||||
clientFailureEvent.getTimestampMs());
|
||||
|
||||
clientEvent.setSessionId(Long.toUnsignedString( clientFailureEvent.getSessionId()));
|
||||
clientEvent.setClientMacAddress(MacAddress.valueOf(clientFailureEvent.getStaMac()));
|
||||
clientEvent.setSsid(clientFailureEvent.getSsid());
|
||||
|
||||
if (clientFailureEvent.hasReasonStr()) {
|
||||
clientEvent.setReasonString(clientFailureEvent.getReasonStr());
|
||||
}
|
||||
|
||||
if (clientFailureEvent.hasReasonCode()) {
|
||||
clientEvent.setReasonCode(WlanReasonCode.getById(clientFailureEvent.getReasonCode()));
|
||||
}
|
||||
clientEvent.setEventTimestamp(clientFailureEvent.getTimestampMs());
|
||||
clientEvent.setCustomerId(customerId);
|
||||
clientEvent.setEquipmentId(equipmentId);
|
||||
clientEvent.setLocationId(locationId);
|
||||
|
||||
LOG.info("publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
}
|
||||
@Async
|
||||
void publishClientFirstDataEvent(int customerId, long equipmentId, long locationId, ClientFirstDataEvent clientFirstDataEvent) {
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientFirstDataEvent, customerId,
|
||||
equipmentId);
|
||||
|
||||
com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientFirstDataEvent(
|
||||
clientFirstDataEvent.getTimestampMs());
|
||||
|
||||
clientEvent.setSessionId(Long.toUnsignedString( clientFirstDataEvent.getSessionId()));
|
||||
clientEvent.setClientMacAddress(MacAddress.valueOf(clientFirstDataEvent.getStaMac()));
|
||||
|
||||
if (clientFirstDataEvent.hasFdataTxUpTsInUs()) {
|
||||
clientEvent.setFirstDataSentTs(clientFirstDataEvent.getFdataTxUpTsInUs());
|
||||
}
|
||||
|
||||
if (clientFirstDataEvent.hasFdataRxUpTsInUs()) {
|
||||
clientEvent.setFirstDataRcvdTs(clientFirstDataEvent.getFdataRxUpTsInUs());
|
||||
}
|
||||
clientEvent.setEventTimestamp(clientFirstDataEvent.getTimestampMs());
|
||||
clientEvent.setCustomerId(customerId);
|
||||
clientEvent.setEquipmentId(equipmentId);
|
||||
clientEvent.setLocationId(locationId);
|
||||
|
||||
LOG.info("publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
|
||||
}
|
||||
@Async
|
||||
void publishClientIdEvent(int customerId, long equipmentId, long locationId, ClientIdEvent clientIdEvent) {
|
||||
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIdEvent, customerId, equipmentId);
|
||||
|
||||
com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientIdEvent(
|
||||
clientIdEvent.getTimestampMs());
|
||||
|
||||
clientEvent.setSessionId(Long.toUnsignedString( clientIdEvent.getSessionId()));
|
||||
clientEvent.setClientMacAddress(MacAddress.valueOf(clientIdEvent.getCltMac()));
|
||||
if (clientIdEvent.hasCltId()) {
|
||||
clientEvent.setUserId(clientIdEvent.getCltId());
|
||||
}
|
||||
clientEvent.setEventTimestamp(clientIdEvent.getTimestampMs());
|
||||
clientEvent.setCustomerId(customerId);
|
||||
clientEvent.setEquipmentId(equipmentId);
|
||||
clientEvent.setLocationId(locationId);
|
||||
|
||||
LOG.info("publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
}
|
||||
@Async
|
||||
void publishClientIpEvent(int customerId, long equipmentId, long locationId, ClientIpEvent clientIpEvent) {
|
||||
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientIpEvent, customerId, equipmentId);
|
||||
@@ -312,7 +496,320 @@ public class RealtimeEventPublisher {
|
||||
LOG.info("publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishClientTimeoutEvent(int customerId, long equipmentId, long locationId, ClientTimeoutEvent clientTimeoutEvent) {
|
||||
|
||||
LOG.info("Received ClientEvent {} for customerId {} equipmentId {}", clientTimeoutEvent, customerId,
|
||||
equipmentId);
|
||||
|
||||
com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent clientEvent = new com.telecominfraproject.wlan.client.models.events.realtime.ClientTimeoutEvent(
|
||||
clientTimeoutEvent.getTimestampMs());
|
||||
|
||||
clientEvent.setSessionId(Long.toUnsignedString( clientTimeoutEvent.getSessionId()));
|
||||
clientEvent.setClientMacAddress(MacAddress.valueOf(clientTimeoutEvent.getStaMac()));
|
||||
if (clientTimeoutEvent.hasRCode()) {
|
||||
clientEvent.setTimeoutReason(clientTimeoutEvent.getRCode().equals(CTReasonType.CTR_IDLE_TOO_LONG)
|
||||
? ClientTimeoutReason.IdleTooLong
|
||||
: ClientTimeoutReason.FailedProbe);
|
||||
}
|
||||
if (clientTimeoutEvent.hasLastRcvUpTsInUs()) {
|
||||
clientEvent.setLastRecvTime(clientTimeoutEvent.getLastRcvUpTsInUs());
|
||||
}
|
||||
if (clientTimeoutEvent.hasLastSentUpTsInUs()) {
|
||||
clientEvent.setLastSentTime(clientTimeoutEvent.getLastSentUpTsInUs());
|
||||
}
|
||||
clientEvent.setEventTimestamp(clientTimeoutEvent.getTimestampMs());
|
||||
clientEvent.setCustomerId(customerId);
|
||||
clientEvent.setEquipmentId(equipmentId);
|
||||
clientEvent.setLocationId(locationId);
|
||||
|
||||
LOG.info("publishing client event {} to cloud", clientEvent);
|
||||
cloudEventDispatcherInterface.publishEvent(clientEvent);
|
||||
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishDhcpTransactionEvents(int customerId, long equipmentId, long locationId, List<DhcpTransaction> dhcpTransactionList) {
|
||||
LOG.info("Publish Dhcp Transaction Events for customer {} equipmentId {}", customerId, equipmentId);
|
||||
List<SystemEvent> dhcpEventsList = new ArrayList<>();
|
||||
for (DhcpTransaction dhcpTransaction : dhcpTransactionList) {
|
||||
|
||||
for (DhcpAckEvent ackEvent : dhcpTransaction.getDhcpAckEventList()) {
|
||||
LOG.debug("DhcpAckEvent {}", ackEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent cloudDhcpAck = new com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent();
|
||||
|
||||
cloudDhcpAck.setCustomerId(customerId);
|
||||
cloudDhcpAck.setEquipmentId(equipmentId);
|
||||
cloudDhcpAck.setLocationId(locationId);
|
||||
|
||||
if (ackEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpAck = (com.telecominfraproject.wlan.systemevent.equipment.DhcpAckEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpAck, ackEvent.getDhcpCommonData());
|
||||
} else {
|
||||
cloudDhcpAck.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
if (ackEvent.hasGatewayIp()) {
|
||||
try {
|
||||
cloudDhcpAck.setGatewayIp(InetAddress.getByAddress(ackEvent.getGatewayIp().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid GatewayIP", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (ackEvent.hasLeaseTime()) {
|
||||
cloudDhcpAck.setLeaseTime(ackEvent.getLeaseTime());
|
||||
}
|
||||
|
||||
if (ackEvent.hasPrimaryDns()) {
|
||||
try {
|
||||
cloudDhcpAck.setPrimaryDns(InetAddress.getByAddress(ackEvent.getPrimaryDns().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid PrimaryDNS", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (ackEvent.hasSecondaryDns()) {
|
||||
try {
|
||||
cloudDhcpAck
|
||||
.setSecondaryDns(InetAddress.getByAddress(ackEvent.getSecondaryDns().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid SecondaryDNS", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (ackEvent.hasRebindingTime()) {
|
||||
cloudDhcpAck.setRebindingTime(ackEvent.getRebindingTime());
|
||||
}
|
||||
|
||||
if (ackEvent.hasRenewalTime()) {
|
||||
cloudDhcpAck.setRenewalTime(ackEvent.getRenewalTime());
|
||||
}
|
||||
|
||||
if (ackEvent.hasSubnetMask()) {
|
||||
try {
|
||||
cloudDhcpAck.setSubnetMask(InetAddress.getByAddress(ackEvent.getSubnetMask().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid SubnetMask", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (ackEvent.hasTimeOffset()) {
|
||||
cloudDhcpAck.setTimeOffset(ackEvent.getTimeOffset());
|
||||
}
|
||||
|
||||
LOG.debug("Cloud DhcpAckEvent {}", cloudDhcpAck);
|
||||
|
||||
dhcpEventsList.add(cloudDhcpAck);
|
||||
}
|
||||
|
||||
for (DhcpNakEvent nakEvent : dhcpTransaction.getDhcpNakEventList()) {
|
||||
LOG.debug("DhcpNakEvent {}", nakEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent cloudDhcpNak = new com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent();
|
||||
|
||||
cloudDhcpNak.setCustomerId(customerId);
|
||||
cloudDhcpNak.setEquipmentId(equipmentId);
|
||||
cloudDhcpNak.setLocationId(locationId);
|
||||
|
||||
if (nakEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpNak = (com.telecominfraproject.wlan.systemevent.equipment.DhcpNakEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpNak, nakEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpNak.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
if (nakEvent.hasFromInternal()) {
|
||||
cloudDhcpNak.setFromInternal(nakEvent.getFromInternal());
|
||||
}
|
||||
|
||||
LOG.debug("Cloud DhcpNakEvent {}", cloudDhcpNak);
|
||||
|
||||
dhcpEventsList.add(cloudDhcpNak);
|
||||
|
||||
}
|
||||
|
||||
for (DhcpOfferEvent offerEvent : dhcpTransaction.getDhcpOfferEventList()) {
|
||||
LOG.debug("DhcpOfferEvent {}", offerEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent cloudDhcpOffer = new com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent();
|
||||
|
||||
cloudDhcpOffer.setCustomerId(customerId);
|
||||
cloudDhcpOffer.setEquipmentId(equipmentId);
|
||||
cloudDhcpOffer.setLocationId(locationId);
|
||||
|
||||
if (offerEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpOffer = (com.telecominfraproject.wlan.systemevent.equipment.DhcpOfferEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpOffer, offerEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpOffer.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
if (offerEvent.hasFromInternal()) {
|
||||
cloudDhcpOffer.setFromInternal(offerEvent.getFromInternal());
|
||||
}
|
||||
|
||||
dhcpEventsList.add(cloudDhcpOffer);
|
||||
|
||||
}
|
||||
|
||||
for (DhcpInformEvent informEvent : dhcpTransaction.getDhcpInformEventList()) {
|
||||
LOG.debug("DhcpInformEvent {}", informEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent cloudDhcpInform = new com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent();
|
||||
|
||||
cloudDhcpInform.setCustomerId(customerId);
|
||||
cloudDhcpInform.setEquipmentId(equipmentId);
|
||||
cloudDhcpInform.setLocationId(locationId);
|
||||
|
||||
if (informEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpInform = (com.telecominfraproject.wlan.systemevent.equipment.DhcpInformEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpInform, informEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpInform.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
dhcpEventsList.add(cloudDhcpInform);
|
||||
|
||||
}
|
||||
|
||||
for (DhcpDeclineEvent declineEvent : dhcpTransaction.getDhcpDeclineEventList()) {
|
||||
LOG.debug("DhcpDeclineEvent {}", declineEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent cloudDhcpDecline = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent();
|
||||
|
||||
cloudDhcpDecline.setCustomerId(customerId);
|
||||
cloudDhcpDecline.setEquipmentId(equipmentId);
|
||||
cloudDhcpDecline.setLocationId(locationId);
|
||||
|
||||
if (declineEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpDecline = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDeclineEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpDecline, declineEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpDecline.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
LOG.debug("Cloud DhcpDeclineEvent {}", cloudDhcpDecline);
|
||||
|
||||
dhcpEventsList.add(cloudDhcpDecline);
|
||||
|
||||
}
|
||||
|
||||
for (DhcpRequestEvent requestEvent : dhcpTransaction.getDhcpRequestEventList()) {
|
||||
LOG.debug("DhcpRequestEvent {}", requestEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent cloudDhcpRequest = new com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent();
|
||||
|
||||
cloudDhcpRequest.setCustomerId(customerId);
|
||||
cloudDhcpRequest.setEquipmentId(equipmentId);
|
||||
cloudDhcpRequest.setLocationId(locationId);
|
||||
|
||||
if (requestEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpRequest = (com.telecominfraproject.wlan.systemevent.equipment.DhcpRequestEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpRequest, requestEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpRequest.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
if (requestEvent.hasHostname()) {
|
||||
cloudDhcpRequest.setHostName(requestEvent.getHostname());
|
||||
}
|
||||
|
||||
LOG.debug("Cloud DhcpRequestEvent {}", cloudDhcpRequest);
|
||||
|
||||
dhcpEventsList.add(cloudDhcpRequest);
|
||||
|
||||
}
|
||||
|
||||
for (DhcpDiscoverEvent discoverEvent : dhcpTransaction.getDhcpDiscoverEventList()) {
|
||||
LOG.debug("DhcpDiscoverEvent {}", discoverEvent);
|
||||
|
||||
com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent cloudDhcpDiscover = new com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent();
|
||||
|
||||
cloudDhcpDiscover.setCustomerId(customerId);
|
||||
cloudDhcpDiscover.setEquipmentId(equipmentId);
|
||||
cloudDhcpDiscover.setLocationId(locationId);
|
||||
|
||||
if (discoverEvent.hasDhcpCommonData()) {
|
||||
cloudDhcpDiscover = (com.telecominfraproject.wlan.systemevent.equipment.DhcpDiscoverEvent) getDhcpCommonDataForEvent(
|
||||
cloudDhcpDiscover, discoverEvent.getDhcpCommonData());
|
||||
|
||||
} else {
|
||||
cloudDhcpDiscover.setxId(dhcpTransaction.getXId());
|
||||
}
|
||||
|
||||
if (discoverEvent.hasHostname()) {
|
||||
cloudDhcpDiscover.setHostName(discoverEvent.getHostname());
|
||||
}
|
||||
|
||||
LOG.debug("Cloud DhcpDiscoverEvent {}", cloudDhcpDiscover);
|
||||
|
||||
dhcpEventsList.add(cloudDhcpDiscover);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if (dhcpEventsList.size() > 0) {
|
||||
LOG.info("Publishing DhcpEvents {}", dhcpEventsList);
|
||||
cloudEventDispatcherInterface.publishEventsBulk(dhcpEventsList);
|
||||
}
|
||||
}
|
||||
|
||||
BaseDhcpEvent getDhcpCommonDataForEvent(BaseDhcpEvent cloudDhcpEvent, DhcpCommonData dhcpCommonData) {
|
||||
if (dhcpCommonData.hasXId()) {
|
||||
cloudDhcpEvent.setxId(dhcpCommonData.getXId());
|
||||
}
|
||||
|
||||
if (dhcpCommonData.hasVlanId()) {
|
||||
cloudDhcpEvent.setVlanId(dhcpCommonData.getVlanId());
|
||||
}
|
||||
|
||||
if (dhcpCommonData.hasDeviceMacAddress()) {
|
||||
|
||||
try {
|
||||
cloudDhcpEvent.setClientMacAddress(MacAddress.valueOf(dhcpCommonData.getDeviceMacAddress()));
|
||||
} catch (Exception e) {
|
||||
LOG.error("Could not parse device_mac_address from DhcpCommonData ", dhcpCommonData, e);
|
||||
}
|
||||
}
|
||||
|
||||
if (dhcpCommonData.hasDhcpServerIp()) {
|
||||
try {
|
||||
cloudDhcpEvent
|
||||
.setDhcpServerIp(InetAddress.getByAddress(dhcpCommonData.getDhcpServerIp().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid Dhcp Server IP", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (dhcpCommonData.hasClientIp()) {
|
||||
try {
|
||||
cloudDhcpEvent.setClientIp(InetAddress.getByAddress(dhcpCommonData.getClientIp().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid Client IP", e);
|
||||
}
|
||||
}
|
||||
|
||||
if (dhcpCommonData.hasRelayIp()) {
|
||||
try {
|
||||
cloudDhcpEvent.setRelayIp(InetAddress.getByAddress(dhcpCommonData.getRelayIp().toByteArray()));
|
||||
} catch (UnknownHostException e) {
|
||||
LOG.error("Invalid Relay IP", e);
|
||||
}
|
||||
}
|
||||
|
||||
cloudDhcpEvent.setEventTimestamp(dhcpCommonData.getTimestampMs());
|
||||
|
||||
return cloudDhcpEvent;
|
||||
}
|
||||
|
||||
@Async
|
||||
void publishSipCallEvents(int customerId, long equipmentId, long locationId, List<VideoVoiceReport> sipCallReportList) {
|
||||
// only in case it is not there, we will just use the time when we
|
||||
// received the report/event
|
||||
|
||||
@@ -50,6 +50,7 @@ import com.telecominfraproject.wlan.core.model.entity.CountryCode;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.EquipmentType;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
|
||||
import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
|
||||
import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
|
||||
import com.telecominfraproject.wlan.customer.models.Customer;
|
||||
import com.telecominfraproject.wlan.customer.models.CustomerDetails;
|
||||
@@ -67,7 +68,6 @@ import com.telecominfraproject.wlan.location.models.LocationType;
|
||||
import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPInetState;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPRadioState;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPVIFState;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.utils.MqttStatsPublisher;
|
||||
@@ -85,7 +85,6 @@ import com.telecominfraproject.wlan.status.equipment.models.EquipmentUpgradeStat
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ClientConnectionDetails;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
|
||||
import com.telecominfraproject.wlan.status.models.Status;
|
||||
import com.telecominfraproject.wlan.status.models.StatusDataType;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Uuid;
|
||||
@@ -94,6 +93,7 @@ import sts.OpensyncStats.AssocType;
|
||||
import sts.OpensyncStats.Client;
|
||||
import sts.OpensyncStats.ClientReport;
|
||||
import sts.OpensyncStats.EventReport;
|
||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
|
||||
import sts.OpensyncStats.RadioBandType;
|
||||
import sts.OpensyncStats.Report;
|
||||
|
||||
@@ -176,7 +176,7 @@ public class OpensyncExternalIntegrationCloudTest {
|
||||
location.setDetails(details);
|
||||
location.setName("Location-UT");
|
||||
location.setLocationType(LocationType.BUILDING);
|
||||
Mockito.when(locationServiceInterface.getOrNull(Mockito.anyLong())).thenReturn(location);
|
||||
Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
|
||||
Customer customer = new Customer();
|
||||
customer.setId(2);
|
||||
CustomerDetails customerDetails = new CustomerDetails();
|
||||
@@ -232,7 +232,7 @@ public class OpensyncExternalIntegrationCloudTest {
|
||||
opensyncExternalIntegrationCloud.apConnected("Test_Client_21P10C68818122", createConnectNodeInfo());
|
||||
|
||||
Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
|
||||
Mockito.verify(locationServiceInterface).getOrNull(ArgumentMatchers.anyLong());
|
||||
Mockito.verify(locationServiceInterface).get(8L);
|
||||
|
||||
}
|
||||
|
||||
@@ -246,7 +246,7 @@ public class OpensyncExternalIntegrationCloudTest {
|
||||
location.setDetails(details);
|
||||
location.setName("Location-UT");
|
||||
location.setLocationType(LocationType.BUILDING);
|
||||
Mockito.when(locationServiceInterface.getOrNull(8L)).thenReturn(location);
|
||||
Mockito.when(locationServiceInterface.get(8L)).thenReturn(location);
|
||||
|
||||
Customer customer = new Customer();
|
||||
customer.setId(2);
|
||||
@@ -326,7 +326,7 @@ public class OpensyncExternalIntegrationCloudTest {
|
||||
Mockito.verify(customerServiceInterface).getOrNull(ArgumentMatchers.anyInt());
|
||||
Mockito.verify(equipmentServiceInterface).getByInventoryIdOrNull("Test_Client_21P10C68818122");
|
||||
Mockito.verify(firmwareServiceInterface).getDefaultCustomerTrackSetting();
|
||||
Mockito.verify(locationServiceInterface, Mockito.times(2)).getOrNull(ArgumentMatchers.anyLong());
|
||||
Mockito.verify(locationServiceInterface, Mockito.times(2)).get(ArgumentMatchers.anyLong());
|
||||
|
||||
}
|
||||
|
||||
@@ -702,26 +702,6 @@ public class OpensyncExternalIntegrationCloudTest {
|
||||
Mockito.verify(statusServiceInterface, Mockito.never()).update(bssidStatus);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testParseRawDataToWiredPortStatus() {
|
||||
Map<String, List<WiredPortStatus>> portStatus = new HashMap<>();
|
||||
OpensyncAPInetState inetState = new OpensyncAPInetState();
|
||||
inetState.setIfType("bridge");
|
||||
@SuppressWarnings("serial")
|
||||
Map<String, String> ethPorts = new HashMap<String, String>(){{
|
||||
put("eth0", "up lan 1000Mbps full");
|
||||
put("eth1", "up wan 1000Mbps full");
|
||||
put("eth2", "incorrect value");
|
||||
}};
|
||||
inetState.setIfName("lan");
|
||||
inetState.setEthPorts(ethPorts);
|
||||
opensyncExternalIntegrationCloud.parseRawDataToWiredPortStatus(2, 1, portStatus, inetState);
|
||||
assertEquals(1, portStatus.size());
|
||||
assertEquals(true, portStatus.containsKey("lan"));
|
||||
assertEquals(2, portStatus.get("lan").size());
|
||||
assertEquals("lan", portStatus.get("lan").get(0).getCurrentIfName());
|
||||
}
|
||||
|
||||
@Ignore
|
||||
public void testWifiInetStateDbTableUpdate() {
|
||||
|
||||
@@ -0,0 +1,391 @@
|
||||
package com.telecominfraproject.wlan.opensync.external.integration.utils;
|
||||
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
import java.net.InetAddress;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.ArgumentMatchers;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoSession;
|
||||
import org.mockito.quality.Strictness;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.protobuf.ByteString;
|
||||
import com.telecominfraproject.wlan.alarm.AlarmServiceInterface;
|
||||
import com.telecominfraproject.wlan.client.ClientServiceInterface;
|
||||
import com.telecominfraproject.wlan.client.info.models.ClientInfoDetails;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSession;
|
||||
import com.telecominfraproject.wlan.client.session.models.ClientSessionDetails;
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherInterface;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
|
||||
import com.telecominfraproject.wlan.customer.service.CustomerServiceInterface;
|
||||
import com.telecominfraproject.wlan.equipment.EquipmentServiceInterface;
|
||||
import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
|
||||
import com.telecominfraproject.wlan.equipment.models.Equipment;
|
||||
import com.telecominfraproject.wlan.firmware.FirmwareServiceInterface;
|
||||
import com.telecominfraproject.wlan.location.service.LocationServiceInterface;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.OpensyncExternalIntegrationCloud;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.controller.OpensyncCloudGatewayController;
|
||||
import com.telecominfraproject.wlan.profile.ProfileServiceInterface;
|
||||
import com.telecominfraproject.wlan.routing.RoutingServiceInterface;
|
||||
import com.telecominfraproject.wlan.servicemetric.apnode.models.ApNodeMetrics;
|
||||
import com.telecominfraproject.wlan.servicemetric.apnode.models.StateUpDownError;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceInterface;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSID;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.ActiveBSSIDs;
|
||||
import com.telecominfraproject.wlan.status.models.Status;
|
||||
import com.telecominfraproject.wlan.status.models.StatusDataType;
|
||||
|
||||
import sts.OpensyncStats.AssocType;
|
||||
import sts.OpensyncStats.ChannelSwitchReason;
|
||||
import sts.OpensyncStats.Client;
|
||||
import sts.OpensyncStats.ClientReport;
|
||||
import sts.OpensyncStats.DNSProbeMetric;
|
||||
import sts.OpensyncStats.EventReport;
|
||||
import sts.OpensyncStats.EventReport.ChannelSwitchEvent;
|
||||
import sts.OpensyncStats.EventReport.ClientAssocEvent;
|
||||
import sts.OpensyncStats.NetworkProbe;
|
||||
import sts.OpensyncStats.RADIUSMetrics;
|
||||
import sts.OpensyncStats.RadioBandType;
|
||||
import sts.OpensyncStats.Report;
|
||||
import sts.OpensyncStats.StateUpDown;
|
||||
import sts.OpensyncStats.VLANMetrics;
|
||||
|
||||
@RunWith(SpringRunner.class)
|
||||
@ActiveProfiles(profiles = { "integration_test", })
|
||||
@SpringBootTest(webEnvironment = WebEnvironment.NONE, classes = MqttStatsPublisherTest.class)
|
||||
@Import(value = { AlarmServiceInterface.class, OpensyncExternalIntegrationCloud.class,
|
||||
MqttStatsPublisherTest.Config.class,
|
||||
|
||||
})
|
||||
public class MqttStatsPublisherTest {
|
||||
|
||||
@MockBean
|
||||
AlarmServiceInterface alarmServiceInterface;
|
||||
@MockBean
|
||||
CustomerServiceInterface customerServiceInterface;
|
||||
@MockBean
|
||||
LocationServiceInterface locationServiceInterface;
|
||||
@MockBean(answer = Answers.RETURNS_MOCKS)
|
||||
OvsdbSessionMapInterface ovsdbSessionMapInterface;
|
||||
@MockBean
|
||||
CloudEventDispatcherInterface equipmentMetricsCollectorInterface;
|
||||
@MockBean
|
||||
EquipmentServiceInterface equipmentServiceInterface;
|
||||
@MockBean
|
||||
RoutingServiceInterface routingServiceInterface;
|
||||
@MockBean
|
||||
ProfileServiceInterface profileServiceInterface;
|
||||
@MockBean
|
||||
StatusServiceInterface statusServiceInterface;
|
||||
@MockBean
|
||||
ClientServiceInterface clientServiceInterface;
|
||||
@MockBean
|
||||
FirmwareServiceInterface firmwareServiceInterface;
|
||||
@MockBean(answer = Answers.RETURNS_MOCKS)
|
||||
OpensyncCloudGatewayController gatewayController;
|
||||
@MockBean
|
||||
RealtimeEventPublisher realtimeEventPublisher;
|
||||
@Autowired
|
||||
MqttStatsPublisher opensyncExternalIntegrationMqttProcessor;
|
||||
|
||||
MockitoSession mockito;
|
||||
|
||||
@Configuration
|
||||
static class Config {
|
||||
|
||||
@Bean
|
||||
public StatsPublisherInterface mqttStatsPublisher() {
|
||||
return new MqttStatsPublisher();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
|
||||
mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.LENIENT).startMocking();
|
||||
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
mockito.finishMocking();
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExtractApIdFromTopic() {
|
||||
|
||||
String topic = "/ap/Test_Client_21P10C68818122/opensync";
|
||||
|
||||
assertEquals("Test_Client_21P10C68818122", MqttStatsPublisher.extractApIdFromTopic(topic));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExtractCustomerIdFromTopic() {
|
||||
String topic = "/ap/Test_Client_21P10C68818122/opensync";
|
||||
OvsdbSession session = Mockito.mock(OvsdbSession.class);
|
||||
Equipment ce = Mockito.mock(Equipment.class);
|
||||
Mockito.when(ce.getCustomerId()).thenReturn(2);
|
||||
|
||||
Mockito.when(
|
||||
equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
|
||||
.thenReturn(ce);
|
||||
Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
|
||||
|
||||
assertEquals(2, opensyncExternalIntegrationMqttProcessor.extractCustomerIdFromTopic(topic));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExtractEquipmentIdFromTopic() {
|
||||
|
||||
String topic = "/ap/Test_Client_21P10C68818122/opensync";
|
||||
OvsdbSession session = Mockito.mock(OvsdbSession.class);
|
||||
Mockito.when(session.getEquipmentId()).thenReturn(1L);
|
||||
|
||||
Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
|
||||
|
||||
assertEquals(1L, opensyncExternalIntegrationMqttProcessor.extractEquipmentIdFromTopic(topic));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testProcessMqttMessageStringReport() {
|
||||
Equipment equipment = new Equipment();
|
||||
|
||||
equipment.setDetails(ApElementConfiguration.createWithDefaults());
|
||||
equipment.setId(1L); equipment.setCustomerId(2);
|
||||
|
||||
Mockito.when(
|
||||
equipmentServiceInterface.getByInventoryIdOrNull(ArgumentMatchers.eq("Test_Client_21P10C68818122")))
|
||||
.thenReturn(equipment);
|
||||
|
||||
equipment.setProfileId(0L);
|
||||
|
||||
Mockito.when(equipmentServiceInterface.getOrNull(1L)).thenReturn(equipment);
|
||||
Mockito.when(equipmentServiceInterface.get(1L)).thenReturn(equipment);
|
||||
|
||||
Report report = Report.newBuilder().setNodeID("21P10C68818122")
|
||||
.addAllClients(getOpensyncStatsClientReportsList())
|
||||
.addAllEventReport(getOpensyncStatsEventReportsList()).build();
|
||||
|
||||
String topic = "/ap/Test_Client_21P10C68818122/opensync";
|
||||
|
||||
OvsdbSession session = Mockito.mock(OvsdbSession.class);
|
||||
Mockito.when(session.getEquipmentId()).thenReturn(1L);
|
||||
|
||||
Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(session);
|
||||
|
||||
Status bssidStatus = new Status();
|
||||
bssidStatus.setStatusDataType(StatusDataType.ACTIVE_BSSIDS);
|
||||
bssidStatus.setCustomerId(2);
|
||||
|
||||
ActiveBSSIDs activeBssidsDetails = new ActiveBSSIDs();
|
||||
activeBssidsDetails.setActiveBSSIDs(getActiveBssidList());
|
||||
bssidStatus.setDetails(activeBssidsDetails);
|
||||
|
||||
Mockito.when(statusServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
|
||||
ArgumentMatchers.eq(StatusDataType.ACTIVE_BSSIDS))).thenReturn(bssidStatus);
|
||||
|
||||
Mockito.when(statusServiceInterface.update(ArgumentMatchers.any(Status.class))).thenReturn(bssidStatus);
|
||||
com.telecominfraproject.wlan.client.models.Client clientInstance = new com.telecominfraproject.wlan.client.models.Client();
|
||||
clientInstance.setMacAddress(MacAddress.valueOf("7C:AB:60:E6:EA:4D"));
|
||||
clientInstance.setDetails(new ClientInfoDetails());
|
||||
com.telecominfraproject.wlan.client.models.Client clientInstance2 = new com.telecominfraproject.wlan.client.models.Client();
|
||||
clientInstance2.setMacAddress(MacAddress.valueOf("C0:9A:D0:76:A9:69"));
|
||||
clientInstance2.setDetails(new ClientInfoDetails());
|
||||
Mockito.when(
|
||||
clientServiceInterface.getOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.any(MacAddress.class)))
|
||||
.thenReturn(clientInstance).thenReturn(clientInstance2);
|
||||
Mockito.when(clientServiceInterface
|
||||
.update(ArgumentMatchers.any(com.telecominfraproject.wlan.client.models.Client.class)))
|
||||
.thenReturn(clientInstance).thenReturn(clientInstance2);
|
||||
|
||||
ClientSession clientSession = new ClientSession();
|
||||
clientSession.setMacAddress(MacAddress.valueOf("7C:AB:60:E6:EA:4D"));
|
||||
clientSession.setDetails(new ClientSessionDetails());
|
||||
ClientSession clientSession2 = new ClientSession();
|
||||
clientSession2.setMacAddress(MacAddress.valueOf("C0:9A:D0:76:A9:69"));
|
||||
clientSession2.setDetails(new ClientSessionDetails());
|
||||
Mockito.when(clientServiceInterface.getSessionOrNull(ArgumentMatchers.anyInt(), ArgumentMatchers.anyLong(),
|
||||
ArgumentMatchers.any(MacAddress.class))).thenReturn(clientSession).thenReturn(clientSession2);
|
||||
|
||||
Mockito.when(clientServiceInterface.updateSession(ArgumentMatchers.any(ClientSession.class)))
|
||||
.thenReturn(clientSession).thenReturn(clientSession2);
|
||||
|
||||
opensyncExternalIntegrationMqttProcessor.processMqttMessage(topic, report);
|
||||
|
||||
// Mockito.verify(clientServiceInterface,
|
||||
// Mockito.times(4)).getOrNull(Mockito.anyInt(),
|
||||
// Mockito.any(MacAddress.class));
|
||||
// Mockito.verify(clientServiceInterface,
|
||||
// Mockito.times(4)).getSessionOrNull(Mockito.anyInt(),
|
||||
// Mockito.anyLong(),
|
||||
// Mockito.any(MacAddress.class));
|
||||
// Mockito.verify(statusServiceInterface,
|
||||
// Mockito.times(3)).getOrNull(Mockito.anyInt(), Mockito.anyLong(),
|
||||
// Mockito.eq(StatusDataType.ACTIVE_BSSIDS));
|
||||
|
||||
}
|
||||
|
||||
@Ignore
|
||||
public void testProcessMqttMessageStringFlowReport() {
|
||||
// TODO: implement me when support flow reports
|
||||
}
|
||||
|
||||
@Ignore
|
||||
public void testProcessMqttMessageStringWCStatsReport() {
|
||||
// TODO: implement me when wcs stats reports supported
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testpopulateNetworkProbeMetrics() throws Exception {
|
||||
|
||||
InetAddress ip = InetAddress.getLocalHost();
|
||||
|
||||
DNSProbeMetric dnsProbeMetric = DNSProbeMetric.getDefaultInstance().toBuilder().setLatency(10)
|
||||
.setState(StateUpDown.SUD_up).setServerIP(ip.getHostName()).build();
|
||||
RADIUSMetrics radiusProbeMetric = RADIUSMetrics.getDefaultInstance().toBuilder().setLatency(10)
|
||||
.setRadiusState(StateUpDown.SUD_up).setServerIP(ip.getHostName()).build();
|
||||
VLANMetrics vlanMetrics = VLANMetrics.getDefaultInstance().toBuilder().setLatency(10)
|
||||
.setDhcpState(StateUpDown.SUD_up).setVlanIF("vlan-1").build();
|
||||
NetworkProbe networkProbe = NetworkProbe.getDefaultInstance().toBuilder().setVlanProbe(vlanMetrics)
|
||||
.setDnsProbe(dnsProbeMetric).addRadiusProbe(radiusProbeMetric).build();
|
||||
|
||||
Report report = Report.getDefaultInstance().toBuilder().setNodeID("21P10C68818122")
|
||||
.addNetworkProbe(networkProbe).build();
|
||||
|
||||
ApNodeMetrics apNodeMetrics = new ApNodeMetrics();
|
||||
|
||||
opensyncExternalIntegrationMqttProcessor.populateNetworkProbeMetrics(report, apNodeMetrics);
|
||||
|
||||
assertNotNull(apNodeMetrics.getNetworkProbeMetrics());
|
||||
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDnsLatencyMs() == 10);
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDhcpLatencyMs() == 10);
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getRadiusState().equals(StateUpDownError.enabled));
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDhcpState().equals(StateUpDownError.enabled));
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getDnsState().equals(StateUpDownError.enabled));
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getRadiusLatencyInMs() == 10);
|
||||
assert (apNodeMetrics.getNetworkProbeMetrics().get(0).getVlanIF().equals("vlan-1"));
|
||||
|
||||
}
|
||||
|
||||
// Helper methods
|
||||
private List<ActiveBSSID> getActiveBssidList() {
|
||||
ActiveBSSID activeBssid = new ActiveBSSID();
|
||||
activeBssid.setBssid("24:f5:a2:ef:2e:54");
|
||||
activeBssid.setSsid("ssid-1");
|
||||
activeBssid.setNumDevicesConnected(1);
|
||||
activeBssid.setRadioType(RadioType.is2dot4GHz);
|
||||
ActiveBSSID activeBssid2 = new ActiveBSSID();
|
||||
activeBssid2.setBssid("24:f5:a2:ef:2e:55");
|
||||
activeBssid2.setSsid("ssid-2");
|
||||
activeBssid2.setNumDevicesConnected(1);
|
||||
activeBssid2.setRadioType(RadioType.is5GHzL);
|
||||
ActiveBSSID activeBssid3 = new ActiveBSSID();
|
||||
activeBssid3.setBssid("24:f5:a2:ef:2e:56");
|
||||
activeBssid3.setSsid("ssid-3");
|
||||
activeBssid3.setNumDevicesConnected(1);
|
||||
activeBssid3.setRadioType(RadioType.is5GHzU);
|
||||
|
||||
List<ActiveBSSID> bssidList = new ArrayList<>();
|
||||
bssidList.add(activeBssid);
|
||||
bssidList.add(activeBssid2);
|
||||
bssidList.add(activeBssid3);
|
||||
return bssidList;
|
||||
}
|
||||
private List<EventReport> getOpensyncStatsEventReportsList() {
|
||||
|
||||
sts.OpensyncStats.EventReport.ClientAssocEvent.Builder clientAssocBuilder = EventReport.ClientAssocEvent
|
||||
.getDefaultInstance().toBuilder();
|
||||
clientAssocBuilder.setAssocType(AssocType.ASSOC);
|
||||
clientAssocBuilder.setBand(RadioBandType.BAND5GU);
|
||||
clientAssocBuilder.setRssi(-65);
|
||||
clientAssocBuilder.setStaMac("C0:9A:D0:76:A9:69");
|
||||
clientAssocBuilder.setStaMacBytes(ByteString.copyFrom("C0:9A:D0:76:A9:69".getBytes()));
|
||||
clientAssocBuilder.setSessionId(1000L);
|
||||
clientAssocBuilder.setInternalSc(1);
|
||||
clientAssocBuilder.setSsid("ssid-3");
|
||||
clientAssocBuilder.setStatus(1);
|
||||
clientAssocBuilder.setTimestampMs(System.currentTimeMillis());
|
||||
|
||||
List<EventReport> eventReportList = new ArrayList<>();
|
||||
|
||||
EventReport.Builder eventReportBuilder = EventReport.getDefaultInstance().toBuilder();
|
||||
|
||||
sts.OpensyncStats.EventReport.ClientSession.Builder clientSessionBuilder = sts.OpensyncStats.EventReport.ClientSession
|
||||
.getDefaultInstance().toBuilder();
|
||||
|
||||
clientSessionBuilder.setSessionId(1000L);
|
||||
|
||||
clientSessionBuilder.setClientAssocEvent(clientAssocBuilder.build());
|
||||
List<sts.OpensyncStats.EventReport.ClientSession> clientSessionList = new ArrayList<>();
|
||||
clientSessionList.add(clientSessionBuilder.build());
|
||||
|
||||
sts.OpensyncStats.EventReport.ChannelSwitchEvent.Builder channelSwitchEventBuilder = sts.OpensyncStats.EventReport.ChannelSwitchEvent
|
||||
.getDefaultInstance().toBuilder();
|
||||
channelSwitchEventBuilder.setBand(RadioBandType.BAND5GL).setChannel(40)
|
||||
.setReason(ChannelSwitchReason.high_interference).setTimestampMs(System.currentTimeMillis());
|
||||
|
||||
List<ChannelSwitchEvent> channelSwitchEventList = new ArrayList<>();
|
||||
channelSwitchEventList.add(channelSwitchEventBuilder.build());
|
||||
|
||||
eventReportBuilder.addAllClientSession(clientSessionList);
|
||||
eventReportBuilder.addAllChannelSwitch(channelSwitchEventList);
|
||||
|
||||
eventReportList.add(eventReportBuilder.build());
|
||||
|
||||
return eventReportList;
|
||||
|
||||
}
|
||||
|
||||
private List<ClientReport> getOpensyncStatsClientReportsList() {
|
||||
int rssi = Long.valueOf(4294967239L).intValue();
|
||||
|
||||
Client.Stats clientStats = Client.Stats.getDefaultInstance().toBuilder().setRssi(rssi).setRxBytes(225554786)
|
||||
.setRxRate(24000.0).setTxBytes(1208133026).setTxRate(433300.0).setRssi(758722570).setRxFrames(10000)
|
||||
.setTxFrames(10000).setTxRate(24000.0).build();
|
||||
Client client2g = Client.getDefaultInstance().toBuilder().setMacAddress("7C:AB:60:E6:EA:4D").setSsid("ssid-1")
|
||||
.setConnected(true).setDurationMs(59977).setStats(clientStats).build();
|
||||
Client client5gu = Client.getDefaultInstance().toBuilder().setMacAddress("C0:9A:D0:76:A9:69").setSsid("ssid-3")
|
||||
.setConnected(true).setDurationMs(298127).setStats(clientStats).build();
|
||||
|
||||
ClientReport clientReport2g = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND2G)
|
||||
.setChannel(6).addAllClientList(ImmutableList.of(client2g)).build();
|
||||
ClientReport clientReport5gl = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GL)
|
||||
.setChannel(36).addAllClientList(new ArrayList<Client>()).build();
|
||||
ClientReport clientReport5gu = ClientReport.getDefaultInstance().toBuilder().setBand(RadioBandType.BAND5GU)
|
||||
.setChannel(157).addAllClientList(ImmutableList.of(client5gu)).build();
|
||||
|
||||
List<ClientReport> clients = new ArrayList<>();
|
||||
clients.add(clientReport2g);
|
||||
clients.add(clientReport5gl);
|
||||
clients.add(clientReport5gu);
|
||||
return clients;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -159,6 +159,130 @@ public class RealtimeEventPublisherTest {
|
||||
// TODO: implement
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPublishDhcpTransactionEvents() throws Exception {
|
||||
|
||||
long timestamp = System.currentTimeMillis();
|
||||
List<DhcpTransaction> dhcpTransactionList = new ArrayList<>();
|
||||
DhcpAckEvent ackEvent = DhcpAckEvent.newBuilder()
|
||||
.setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("c0:9a:d0:76:a9:69")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
|
||||
.setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
|
||||
.setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
|
||||
.setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
|
||||
.setLeaseTime(172800).setTimeOffset(10).build();
|
||||
|
||||
DhcpAckEvent ackEvent2 = DhcpAckEvent.newBuilder()
|
||||
.setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("f6:f0:65:99:e2:33")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build())
|
||||
.setGatewayIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setPrimaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.204").getAddress()))
|
||||
.setSecondaryDns(ByteString.copyFrom(InetAddress.getByName("64.71.255.198").getAddress()))
|
||||
.setSubnetMask(ByteString.copyFrom(InetAddress.getByName("255.255.255.0").getAddress()))
|
||||
.setLeaseTime(172800).setTimeOffset(10).build();
|
||||
|
||||
List<DhcpAckEvent> ackEventList = List.of(ackEvent, ackEvent2);
|
||||
|
||||
DhcpNakEvent nakEvent1 = DhcpNakEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("24:f5:a2:ef:2e:53")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
|
||||
|
||||
List<DhcpNakEvent> nakEventList = List.of(nakEvent1);
|
||||
|
||||
DhcpOfferEvent offerEvent1 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("c0:9a:d0:76:a9:69")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
|
||||
|
||||
DhcpOfferEvent offerEvent2 = DhcpOfferEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("f6:f0:65:99:e2:33")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setFromInternal(true).build();
|
||||
|
||||
List<DhcpOfferEvent> offerEventList = List.of(offerEvent1,offerEvent2);
|
||||
|
||||
DhcpDiscoverEvent discoverEvent1 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("c0:9a:d0:76:a9:69")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
|
||||
|
||||
DhcpDiscoverEvent discoverEvent2 = DhcpDiscoverEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("f6:f0:65:99:e2:33")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
|
||||
|
||||
List<DhcpDiscoverEvent> discoverEventList = List.of(discoverEvent1,discoverEvent2);
|
||||
|
||||
DhcpRequestEvent requestEvent1 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("c0:9a:d0:76:a9:69")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPhone").build();
|
||||
|
||||
DhcpRequestEvent requestEvent2 = DhcpRequestEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.65").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("f6:f0:65:99:e2:33")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).setHostname("My-iPad").build();
|
||||
|
||||
List<DhcpRequestEvent> requestEventList = List.of(requestEvent1,requestEvent2);
|
||||
|
||||
DhcpInformEvent informEvent = DhcpInformEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.250").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("c0:9a:d0:76:a9:69")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
|
||||
|
||||
List<DhcpInformEvent> informEventList = List.of(informEvent);
|
||||
|
||||
|
||||
DhcpDeclineEvent declineEvent = DhcpDeclineEvent.newBuilder().setDhcpCommonData(DhcpCommonData.newBuilder(DhcpCommonData.getDefaultInstance())
|
||||
.setClientIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.129").getAddress()))
|
||||
.setDhcpServerIp(ByteString.copyFrom(InetAddress.getByName("10.0.0.1").getAddress()))
|
||||
.setDeviceMacAddress("24:f5:a2:ef:2e:53")
|
||||
.setXId(123456789)
|
||||
.setTimestampMs(Long.valueOf(timestamp/1000).intValue()).build()).build();
|
||||
|
||||
List<DhcpDeclineEvent> declineEventList = List.of(declineEvent);
|
||||
|
||||
|
||||
DhcpTransaction dhcpTransaction = DhcpTransaction.newBuilder(DhcpTransaction.getDefaultInstance())
|
||||
.addAllDhcpAckEvent(ackEventList).addAllDhcpNakEvent(nakEventList).addAllDhcpOfferEvent(offerEventList)
|
||||
.addAllDhcpInformEvent(informEventList).addAllDhcpDeclineEvent(declineEventList)
|
||||
.addAllDhcpDiscoverEvent(discoverEventList).addAllDhcpRequestEvent(requestEventList).setXId(123456789)
|
||||
.build();
|
||||
|
||||
dhcpTransactionList.add(dhcpTransaction);
|
||||
|
||||
realtimeEventPublisher.publishDhcpTransactionEvents(2, 1L, 0L, dhcpTransactionList);
|
||||
|
||||
Mockito.verify(cloudEventDispatcherInterface,Mockito.times(1)).publishEventsBulk(Mockito.anyList());
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testPublishSipCallEvents() throws Exception {
|
||||
|
||||
|
||||
@@ -54,10 +54,4 @@ public interface OpensyncExternalIntegrationInterface {
|
||||
void nodeStateDbTableUpdate(List<Map<String, String>> nodeStateAttributes, String apId);
|
||||
|
||||
void clearEquipmentStatus(String apId);
|
||||
|
||||
void processMqttMessage(String topic, Report report);
|
||||
|
||||
long getConfigVersionFromStatus(String apId);
|
||||
|
||||
void updateConfigVersionInStatus(String apId, long configVersionFromProfiles);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import com.telecominfraproject.wlan.core.model.equipment.LedStatus;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
|
||||
import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.telecominfraproject.wlan.opensync.external.integration;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
|
||||
public class OvsdbSession {
|
||||
@@ -7,6 +9,7 @@ public class OvsdbSession {
|
||||
private String apId;
|
||||
private long routingId;
|
||||
private long equipmentId;
|
||||
private long mostRecentStatsTimestamp;
|
||||
|
||||
public OvsdbClient getOvsdbClient() {
|
||||
return ovsdbClient;
|
||||
@@ -32,5 +35,34 @@ public class OvsdbSession {
|
||||
public void setEquipmentId(long equipmentId) {
|
||||
this.equipmentId = equipmentId;
|
||||
}
|
||||
|
||||
public long getMostRecentStatsTimestamp() {
|
||||
return mostRecentStatsTimestamp;
|
||||
}
|
||||
public void setMostRecentStatsTimestamp(long mostRecentStatsTimestamp) {
|
||||
this.mostRecentStatsTimestamp = mostRecentStatsTimestamp;
|
||||
}
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(apId, equipmentId, mostRecentStatsTimestamp, ovsdbClient, routingId);
|
||||
}
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
OvsdbSession other = (OvsdbSession) obj;
|
||||
return Objects.equals(apId, other.apId) && equipmentId == other.equipmentId && mostRecentStatsTimestamp == other.mostRecentStatsTimestamp
|
||||
&& Objects.equals(ovsdbClient, other.ovsdbClient) && routingId == other.routingId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OvsdbSession [ovsdbClient=" + ovsdbClient + ", apId=" + apId + ", routingId=" + routingId + ", equipmentId=" + equipmentId
|
||||
+ ", mostRecentStatsTimestamp=" + mostRecentStatsTimestamp + "]";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -7,8 +7,6 @@ import java.util.Objects;
|
||||
|
||||
public class ConnectNodeInfo implements Cloneable {
|
||||
|
||||
public static String CONFIG_VERSION_PROPERTY_NAME = "tip/reportedCfgDataVersion";
|
||||
|
||||
public Map<String, String> mqttSettings = new HashMap<>();
|
||||
public Map<String, String> versionMatrix = new HashMap<>();
|
||||
public Map<String, String> wifiRadioStates = new HashMap<>();
|
||||
@@ -37,18 +35,6 @@ public class ConnectNodeInfo implements Cloneable {
|
||||
public String manufacturerDate;
|
||||
public String certificationRegion;
|
||||
|
||||
public long getConfigVersion() {
|
||||
|
||||
long ret = 0;
|
||||
try {
|
||||
ret = Long.parseLong(versionMatrix.get(CONFIG_VERSION_PROPERTY_NAME));
|
||||
} catch(Exception e) {
|
||||
//do nothing
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ConnectNodeInfo clone() {
|
||||
try {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.telecominfraproject.wlan.opensync.external.integration.models;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -39,73 +38,14 @@ public class OpensyncAPConfig extends OpensyncAPBase {
|
||||
private List<Profile> ssidProfile;
|
||||
private List<Profile> metricsProfile;
|
||||
private List<Profile> radiusProfiles;
|
||||
private Profile wiredEthernetPortProfile;
|
||||
private Location equipmentLocation;
|
||||
private EquipmentRoutingRecord equipmentRouting;
|
||||
private EquipmentGatewayRecord equipmentGateway;
|
||||
private List<Profile> captiveProfiles;
|
||||
private List<Profile> bonjourGatewayProfiles;
|
||||
|
||||
private long configVersion;
|
||||
|
||||
private List<MacAddress> blockedClients;
|
||||
|
||||
public long getConfigVersion() {
|
||||
//go through all child objects and get the most recent lastModifiedTimestamp from them
|
||||
configVersion = 0;
|
||||
|
||||
if(customerEquipment!=null && customerEquipment.getLastModifiedTimestamp()> configVersion) {
|
||||
configVersion = customerEquipment.getLastModifiedTimestamp();
|
||||
}
|
||||
|
||||
if(hotspotConfig!=null) {
|
||||
configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20OperatorSet());
|
||||
configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProfileSet());
|
||||
configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20ProviderSet());
|
||||
configVersion = getLatestLastMod(configVersion, hotspotConfig.getHotspot20VenueSet());
|
||||
}
|
||||
|
||||
configVersion = getLatestLastMod(configVersion, apProfile);
|
||||
configVersion = getLatestLastMod(configVersion, rfProfile);
|
||||
configVersion = getLatestLastMod(configVersion, ssidProfile);
|
||||
configVersion = getLatestLastMod(configVersion, metricsProfile);
|
||||
configVersion = getLatestLastMod(configVersion, radiusProfiles);
|
||||
configVersion = getLatestLastMod(configVersion, wiredEthernetPortProfile);
|
||||
|
||||
if(equipmentLocation!=null && equipmentLocation.getLastModifiedTimestamp()> configVersion) {
|
||||
configVersion = equipmentLocation.getLastModifiedTimestamp();
|
||||
}
|
||||
|
||||
configVersion = getLatestLastMod(configVersion, captiveProfiles);
|
||||
configVersion = getLatestLastMod(configVersion, bonjourGatewayProfiles);
|
||||
|
||||
return configVersion;
|
||||
}
|
||||
|
||||
private long getLatestLastMod(long incomingLastMod, Collection<Profile> profiles) {
|
||||
|
||||
if(profiles!=null) {
|
||||
for(Profile p: profiles) {
|
||||
if(incomingLastMod < p.getLastModifiedTimestamp()) {
|
||||
incomingLastMod = p.getLastModifiedTimestamp();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return incomingLastMod;
|
||||
}
|
||||
|
||||
private long getLatestLastMod(long incomingLastMod, Profile profile) {
|
||||
|
||||
if(profile!=null) {
|
||||
if(incomingLastMod < profile.getLastModifiedTimestamp()) {
|
||||
incomingLastMod = profile.getLastModifiedTimestamp();
|
||||
}
|
||||
}
|
||||
|
||||
return incomingLastMod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OpensyncAPConfig clone() {
|
||||
OpensyncAPConfig ret = (OpensyncAPConfig) super.clone();
|
||||
@@ -196,8 +136,7 @@ public class OpensyncAPConfig extends OpensyncAPBase {
|
||||
&& Objects.equals(hotspotConfig, other.hotspotConfig)
|
||||
&& Objects.equals(metricsProfile, other.metricsProfile)
|
||||
&& Objects.equals(radiusProfiles, other.radiusProfiles) && Objects.equals(rfProfile, other.rfProfile)
|
||||
&& Objects.equals(ssidProfile, other.ssidProfile)
|
||||
&& Objects.equals(wiredEthernetPortProfile, other.wiredEthernetPortProfile);
|
||||
&& Objects.equals(ssidProfile, other.ssidProfile);
|
||||
}
|
||||
|
||||
public Profile getApProfile() {
|
||||
@@ -256,15 +195,11 @@ public class OpensyncAPConfig extends OpensyncAPBase {
|
||||
return ssidProfile;
|
||||
}
|
||||
|
||||
public Profile getWiredEthernetPortProfile() {
|
||||
return wiredEthernetPortProfile;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(apProfile, blockedClients, bonjourGatewayProfiles, captiveProfiles, customerEquipment,
|
||||
equipmentGateway, equipmentLocation, equipmentRouting, hotspotConfig, metricsProfile, radiusProfiles,
|
||||
rfProfile, ssidProfile, wiredEthernetPortProfile);
|
||||
rfProfile, ssidProfile);
|
||||
}
|
||||
|
||||
public void setApProfile(Profile apProfile) {
|
||||
@@ -390,8 +325,4 @@ public class OpensyncAPConfig extends OpensyncAPBase {
|
||||
this.ssidProfile = ssidProfile;
|
||||
}
|
||||
|
||||
public void setWiredEthernetPortProfile(Profile wiredEthernetPortProfile) {
|
||||
this.wiredEthernetPortProfile = wiredEthernetPortProfile;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -22,10 +22,8 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
public String ifType;
|
||||
public String softwdsMacAddr;
|
||||
public boolean enabled;
|
||||
public Map<String, String> ethPorts;
|
||||
public boolean sofwdsWrap;
|
||||
public int vlanId;
|
||||
public Map<String, String> vlanTrunk;
|
||||
public String netmask;
|
||||
public boolean nat;
|
||||
public String greRemoteInetAddr;
|
||||
@@ -45,21 +43,17 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
public Uuid _uuid;
|
||||
public Uuid version;
|
||||
public String greLocalInetAddr;
|
||||
// the following attribute is in inetC but not in inetS
|
||||
|
||||
public String greRemoteMacAddr;
|
||||
|
||||
public OpensyncAPInetState() {
|
||||
dns = new HashMap<>();
|
||||
dhcpc = new HashMap<>();
|
||||
ethPorts = new HashMap<>();
|
||||
vlanTrunk = new HashMap<>();
|
||||
}
|
||||
|
||||
public OpensyncAPInetState(Row row) {
|
||||
dns = new HashMap<>();
|
||||
dhcpc = new HashMap<>();
|
||||
ethPorts = new HashMap<>();
|
||||
vlanTrunk = new HashMap<>();
|
||||
|
||||
Map<String, Value> map = row.getColumns();
|
||||
|
||||
@@ -89,12 +83,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
if (map.containsKey("dns")) {
|
||||
this.setDns(row.getMapColumn("dns"));
|
||||
}
|
||||
if (map.containsKey("eth_ports")) {
|
||||
this.setEthPorts(row.getMapColumn("eth_ports"));
|
||||
}
|
||||
if (map.containsKey("vlan_trunk")) {
|
||||
this.setVlanTrunk(row.getMapColumn("vlan_trunk"));
|
||||
}
|
||||
if (map.get("inet_addr") != null
|
||||
&& map.get("inet_addr").getClass().equals(com.vmware.ovsdb.protocol.operation.notation.Atom.class)) {
|
||||
this.setInetAddr(row.getStringColumn("inet_addr"));
|
||||
@@ -169,12 +157,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
if (!Objects.equals(dhcpd, other.dhcpd)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(ethPorts, other.ethPorts)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(vlanTrunk, other.vlanTrunk)) {
|
||||
return false;
|
||||
}
|
||||
if (!Objects.equals(dns, other.dns)) {
|
||||
return false;
|
||||
}
|
||||
@@ -269,14 +251,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
public Map<String, String> getDns() {
|
||||
return dns;
|
||||
}
|
||||
|
||||
public Map<String, String> getEthPorts() {
|
||||
return ethPorts;
|
||||
}
|
||||
|
||||
public Map<String, String> getVlanTrunk() {
|
||||
return vlanTrunk;
|
||||
}
|
||||
|
||||
public String getGateway() {
|
||||
return gateway;
|
||||
@@ -356,9 +330,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, ethPorts, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
|
||||
return Objects.hash(_uuid, broadcast, dhcpc, dhcpd, dns, enabled, gateway, greIfName, greLocalInetAddr, greRemoteInetAddr,
|
||||
hwAddr, ifName, ifType, ifUuid, inetAddr, inetConfig, ipAssignScheme, mtw, nat, netmask, network,
|
||||
parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId, vlanTrunk);
|
||||
parentIfName, greRemoteMacAddr, softwdsMacAddr, sofwdsWrap, unpnpMode, version, vlanId);
|
||||
}
|
||||
|
||||
public boolean isEnabled() {
|
||||
@@ -396,14 +370,6 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
public void setDns(Map<String, String> dns) {
|
||||
this.dns = dns;
|
||||
}
|
||||
|
||||
public void setEthPorts(Map<String, String> ethPorts) {
|
||||
this.ethPorts = ethPorts;
|
||||
}
|
||||
|
||||
public void setVlanTrunk(Map<String, String> vlanTrunk) {
|
||||
this.vlanTrunk = vlanTrunk;
|
||||
}
|
||||
|
||||
public void setEnabled(boolean enabled) {
|
||||
this.enabled = enabled;
|
||||
@@ -500,9 +466,9 @@ public class OpensyncAPInetState extends OpensyncAPBase {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", ethPorts=" + ethPorts + ", unpnpMode=" + unpnpMode + ", ifType="
|
||||
return "OpensyncAPInetState [ifName=" + ifName + ", dhcpd=" + dhcpd + ", unpnpMode=" + unpnpMode + ", ifType="
|
||||
+ ifType + ", softwdsMacAddr=" + softwdsMacAddr + ", enabled=" + enabled + ", sofwdsWrap=" + sofwdsWrap
|
||||
+ ", vlanId=" + vlanId + ", vlanTrunk=" + vlanTrunk + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
|
||||
+ ", vlanId=" + vlanId + ", netmask=" + netmask + ", nat=" + nat + ", greRemoteInetAddr="
|
||||
+ greRemoteInetAddr + ", ifUuid=" + ifUuid + ", inetAddr=" + inetAddr + ", hwAddr=" + hwAddr + ", mtw="
|
||||
+ mtw + ", network=" + network + ", dns=" + dns + ", parentIfName=" + parentIfName + ", greIfName="
|
||||
+ greIfName + ", broadcast=" + broadcast + ", dhcpc=" + dhcpc + ", gateway=" + gateway
|
||||
|
||||
@@ -42,7 +42,7 @@ public class OpensyncAPRadioState extends OpensyncAPBase {
|
||||
public Map<String, String> hwConfig;
|
||||
public int channel;
|
||||
public int txPower;
|
||||
public String htMode; // used in channel bandwidth
|
||||
public String htMode;
|
||||
public int thermalDowngradeTemp;
|
||||
public String hwMode;
|
||||
public boolean enabled;
|
||||
|
||||
@@ -212,14 +212,4 @@ public class OpensyncExternalIntegrationSimple implements OpensyncExternalIntegr
|
||||
LOG.info("nodeStateDbTableUpdate for AP {}", apId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getConfigVersionFromStatus(String inventoryId) {
|
||||
//0 means always push config to ap, do not do the version check for the configuration before pushing it
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateConfigVersionInStatus(String apId, long configVersionFromProfiles) {
|
||||
// do nothing here
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
<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">
|
||||
<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">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.telecominfraproject.wlan</groupId>
|
||||
@@ -72,33 +70,7 @@
|
||||
</dependency>
|
||||
<!-- MQTT dependencies END -->
|
||||
|
||||
<!-- Test Dependencies BEGIN -->
|
||||
<dependency>
|
||||
<artifactId>status-service-local</artifactId>
|
||||
<groupId>com.telecominfraproject.wlan</groupId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>status-service</artifactId>
|
||||
<groupId>com.telecominfraproject.wlan</groupId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>status-datastore-inmemory</artifactId>
|
||||
<groupId>com.telecominfraproject.wlan</groupId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<artifactId>cloud-event-dispatcher-empty</artifactId>
|
||||
<groupId>com.telecominfraproject.wlan</groupId>
|
||||
<version>1.2.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- Test Dependencies END -->
|
||||
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
|
||||
@@ -11,6 +11,10 @@ import org.fusesource.mqtt.client.MQTT;
|
||||
import org.fusesource.mqtt.client.Message;
|
||||
import org.fusesource.mqtt.client.QoS;
|
||||
import org.fusesource.mqtt.client.Topic;
|
||||
import org.fusesource.mqtt.client.Tracer;
|
||||
import org.fusesource.mqtt.codec.MQTTFrame;
|
||||
import org.fusesource.mqtt.codec.PINGREQ;
|
||||
import org.fusesource.mqtt.codec.PINGRESP;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -32,7 +36,8 @@ import com.netflix.servo.monitor.Stopwatch;
|
||||
import com.netflix.servo.monitor.Timer;
|
||||
import com.netflix.servo.tag.TagList;
|
||||
import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
|
||||
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.utils.StatsPublisherInterface;
|
||||
import com.telecominfraproject.wlan.opensync.util.ZlibUtil;
|
||||
|
||||
@@ -58,7 +63,10 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
|
||||
private final Timer timerMessageProcess = new BasicTimer(MonitorConfig.builder("osgw-mqtt-messageProcessTimer").withTags(tags).build());
|
||||
|
||||
@Autowired
|
||||
private OpensyncExternalIntegrationInterface opensyncExternalIntegrationInterface;
|
||||
private StatsPublisherInterface statsPublisher;
|
||||
|
||||
@Autowired
|
||||
private OvsdbSessionMapInterface ovsdbSessionMapInterface;
|
||||
|
||||
// dtop: use anonymous constructor to ensure that the following code always
|
||||
// get executed,
|
||||
@@ -185,8 +193,18 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
|
||||
// Only supported protobuf on the TIP opensync APs is Report
|
||||
Report statsReport = Report.parseFrom(payload);
|
||||
mqttMsg.ack();
|
||||
String apId = extractApIdFromTopic(mqttMsg.getTopic());
|
||||
if (apId != null) {
|
||||
OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(extractApIdFromTopic(mqttMsg.getTopic()));
|
||||
if (ovsdbSession != null) {
|
||||
ovsdbSession.setMostRecentStatsTimestamp(System.currentTimeMillis());
|
||||
LOG.debug("Last metrics received from AP updated to {}",ovsdbSession.toString());
|
||||
} else {
|
||||
LOG.debug("No ovsdb session exists for this AP {}",apId);
|
||||
}
|
||||
}
|
||||
MQTT_LOG.info("Topic {}\n{}", mqttMsg.getTopic(), jsonPrinter.print(statsReport));
|
||||
opensyncExternalIntegrationInterface.processMqttMessage(mqttMsg.getTopic(), statsReport);
|
||||
statsPublisher.processMqttMessage(mqttMsg.getTopic(), statsReport);
|
||||
LOG.debug("Dispatched report for topic {} to backend for processing", mqttMsg.getTopic());
|
||||
|
||||
} catch (Exception e) {
|
||||
@@ -195,7 +213,7 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
|
||||
stopwatchTimerMessageProcess.stop();
|
||||
}
|
||||
}
|
||||
} catch (Throwable e) {
|
||||
} catch (Exception e) {
|
||||
LOG.error("Exception in MQTT receiver", e);
|
||||
} finally {
|
||||
try {
|
||||
@@ -226,5 +244,26 @@ public class OpensyncMqttClient implements ApplicationListener<ContextClosedEven
|
||||
mqttClientThread.interrupt();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param topic
|
||||
* @return apId extracted from the topic name, or null if it cannot be
|
||||
* extracted
|
||||
*/
|
||||
static String extractApIdFromTopic(String topic) {
|
||||
// Topic is formatted as
|
||||
// "/ap/"+clientCn+"_"+ret.serialNumber+"/opensync"
|
||||
if (topic == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
String[] parts = topic.split("/");
|
||||
if (parts.length < 3) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// apId is the third element in the topic
|
||||
return parts[2];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.netflix.servo.DefaultMonitorRegistry;
|
||||
import com.netflix.servo.monitor.BasicCounter;
|
||||
import com.netflix.servo.monitor.Counter;
|
||||
import com.netflix.servo.monitor.MonitorConfig;
|
||||
import com.netflix.servo.monitor.Monitors;
|
||||
import com.netflix.servo.tag.TagList;
|
||||
import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.MacAddress;
|
||||
@@ -18,6 +19,7 @@ import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSession;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.OvsdbSessionMapInterface;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.*;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbDao;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.dao.OvsdbMonitor;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.metrics.OvsdbClientWithMetrics;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.metrics.OvsdbMetrics;
|
||||
import com.telecominfraproject.wlan.opensync.util.OvsdbStringConstants;
|
||||
@@ -28,7 +30,6 @@ import com.vmware.ovsdb.protocol.methods.*;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Row;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Value;
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
import com.vmware.ovsdb.service.OvsdbConnectionInfo;
|
||||
import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
|
||||
import io.netty.handler.ssl.SslContext;
|
||||
import org.slf4j.Logger;
|
||||
@@ -38,7 +39,6 @@ import org.springframework.context.annotation.Profile;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import java.security.cert.Certificate;
|
||||
import java.security.cert.X509Certificate;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
@@ -72,12 +72,6 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
@org.springframework.beans.factory.annotation.Value("${tip.wlan.defaultCommandDurationSec:3600}")
|
||||
private long defaultCommandDurationSec;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromStatus:true}")
|
||||
private boolean checkBeforePushConfigVersionFromStatus;
|
||||
|
||||
@org.springframework.beans.factory.annotation.Value("${tip.wlan.checkConfigVersionFromAp:true}")
|
||||
private boolean checkBeforePushConfigVersionFromAp;
|
||||
|
||||
@Autowired
|
||||
private SslContext sslContext;
|
||||
|
||||
@@ -120,25 +114,18 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
|
||||
@Override
|
||||
public void connected(OvsdbClient ovsdbClient) {
|
||||
|
||||
|
||||
connectionsAttempted.increment();
|
||||
|
||||
|
||||
if (!(ovsdbClient instanceof OvsdbClientWithMetrics)) {
|
||||
ovsdbClient = new OvsdbClientWithMetrics(ovsdbClient, ovsdbMetrics);
|
||||
}
|
||||
|
||||
|
||||
String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
|
||||
int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
|
||||
String subjectDn;
|
||||
try {
|
||||
OvsdbConnectionInfo connectionInfo = ovsdbClient.getConnectionInfo();
|
||||
String remoteHost = connectionInfo.getRemoteAddress().getHostAddress();
|
||||
Certificate remoteCertificate = connectionInfo.getRemoteCertificate();
|
||||
if (remoteCertificate == null) {
|
||||
LOG.debug("Connect attempt no certificate from {} on remote port {}", remoteHost, connectionInfo.getRemotePort());
|
||||
return;
|
||||
}
|
||||
|
||||
int localPort = connectionInfo.getLocalPort();
|
||||
subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
|
||||
subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
|
||||
|
||||
String clientCn = SslUtil.extractCN(subjectDn);
|
||||
LOG.info("ovsdbClient connecting from {} on port {} clientCn {}", remoteHost, localPort, clientCn);
|
||||
@@ -199,9 +186,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
localPort = ovsdbClient.getConnectionInfo().getLocalPort();
|
||||
String subjectDn = null;
|
||||
try {
|
||||
Certificate remoteCertificate = ovsdbClient.getConnectionInfo().getRemoteCertificate();
|
||||
if (remoteCertificate != null)
|
||||
subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
|
||||
subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
|
||||
} catch (Exception e) {
|
||||
// do nothing
|
||||
}
|
||||
@@ -212,7 +197,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
extIntegrationInterface.apDisconnected(key);
|
||||
ovsdbSessionMapInterface.removeSession(key);
|
||||
} catch (Exception e) {
|
||||
LOG.debug("Unable to process ap disconnect. {}", e);
|
||||
LOG.debug("Unable to process ap disconnect. {}", e.getMessage());
|
||||
}
|
||||
}
|
||||
LOG.info("ovsdbClient disconnected from {} on port {} clientCn {} AP {} ", remoteHost, localPort, clientCn, key);
|
||||
@@ -245,79 +230,23 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
String apId = alterClientCnIfRequired(clientCn, connectNodeInfo);
|
||||
|
||||
LOG.debug("Client {} connect for AP {}", clientCn, apId);
|
||||
|
||||
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
|
||||
|
||||
//get last known configVersion from the AP
|
||||
long configVersionFromAp = checkBeforePushConfigVersionFromAp ? connectNodeInfo.getConfigVersion() : 0;
|
||||
|
||||
//get last known configVersion from the EquipmentProtocolStatusData
|
||||
long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
|
||||
|
||||
//get current configVersion from the profiles and equipment
|
||||
long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
|
||||
|
||||
boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
|
||||
|
||||
if(needToPushConfigToAP) {
|
||||
pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
|
||||
}
|
||||
|
||||
LOG.debug("Client connect Done");
|
||||
}
|
||||
|
||||
private boolean needToPushToAp(long configVersionFromAp, long configVersionFromStatus, long configVersionFromProfiles) {
|
||||
|
||||
boolean ret = false;
|
||||
|
||||
if(configVersionFromAp == 0) {
|
||||
LOG.debug("do not know what is on AP, let's push new config");
|
||||
ret = true;
|
||||
}
|
||||
|
||||
if(checkBeforePushConfigVersionFromAp && configVersionFromAp < configVersionFromProfiles ) {
|
||||
LOG.debug("our profiles are more recent than what was pushed to AP previously, let's push new config");
|
||||
ret = true;
|
||||
}
|
||||
|
||||
if(checkBeforePushConfigVersionFromStatus && configVersionFromStatus < configVersionFromProfiles) {
|
||||
LOG.debug("our profiles are more recent than the version stored in the protocol status, let's push new config");
|
||||
ret = true;
|
||||
}
|
||||
|
||||
if(!checkBeforePushConfigVersionFromAp && !checkBeforePushConfigVersionFromStatus) {
|
||||
LOG.debug("we do not do any checks for config versions - let's push new config");
|
||||
ret = true;
|
||||
}
|
||||
|
||||
if(!ret) {
|
||||
LOG.debug("no need to push new config to AP");
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
private void pushConfigToAp(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig, String apInventoryId, long configVersionFromProfiles) {
|
||||
|
||||
ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
|
||||
ovsdbDao.removeAllSsids(ovsdbClient); // always
|
||||
ovsdbDao.removeAllInetConfigs(ovsdbClient);
|
||||
if(opensyncAPConfig!=null) {
|
||||
ovsdbDao.resetWiredPorts(ovsdbClient, opensyncAPConfig); // need to run this first before remove Status
|
||||
}
|
||||
ovsdbDao.removeWifiRrm(ovsdbClient);
|
||||
ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
|
||||
ovsdbDao.removeAllStatsConfigs(ovsdbClient); // always
|
||||
|
||||
extIntegrationInterface.clearEquipmentStatus(apInventoryId);
|
||||
extIntegrationInterface.clearEquipmentStatus(apId);
|
||||
|
||||
OpensyncAPConfig opensyncAPConfig = extIntegrationInterface.getApConfig(apId);
|
||||
|
||||
if (opensyncAPConfig != null) {
|
||||
ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureWiredPort(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
|
||||
if (opensyncAPConfig.getHotspotConfig() != null) {
|
||||
@@ -335,17 +264,12 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
ovsdbDao.updateEventReportingInterval(ovsdbClient, collectionIntervalSecEvent);
|
||||
|
||||
} else {
|
||||
LOG.info("No Configuration available for {}", apInventoryId);
|
||||
LOG.info("No Configuration available for {}", apId);
|
||||
}
|
||||
|
||||
//after a successful config push let's update the configVersion on the AP and in the EquipmentProtocolStatusData
|
||||
if(checkBeforePushConfigVersionFromStatus) {
|
||||
extIntegrationInterface.updateConfigVersionInStatus(apInventoryId, configVersionFromProfiles);
|
||||
}
|
||||
ovsdbDao.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
|
||||
|
||||
LOG.debug("Client connect Done");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Set<String> getConnectedClientIds() {
|
||||
return ovsdbSessionMapInterface.getConnectedClientIds();
|
||||
@@ -392,22 +316,28 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
return;
|
||||
}
|
||||
|
||||
//get last known configVersion from the AP
|
||||
long configVersionFromAp = checkBeforePushConfigVersionFromAp ? ovsdbDao.getConfigVersionFromNode(ovsdbClient) : 0;
|
||||
|
||||
//get last known configVersion from the EquipmentProtocolStatusData
|
||||
long configVersionFromStatus = checkBeforePushConfigVersionFromStatus ? extIntegrationInterface.getConfigVersionFromStatus(apId) : 0;
|
||||
|
||||
//get current configVersion from the profiles and equipment
|
||||
long configVersionFromProfiles = opensyncAPConfig.getConfigVersion();
|
||||
|
||||
boolean needToPushConfigToAP = needToPushToAp(configVersionFromAp, configVersionFromStatus, configVersionFromProfiles);
|
||||
ovsdbDao.removeAllPasspointConfigs(ovsdbClient);
|
||||
ovsdbDao.removeAllSsids(ovsdbClient); // always
|
||||
ovsdbDao.removeAllInetConfigs(ovsdbClient);
|
||||
ovsdbDao.removeWifiRrm(ovsdbClient);
|
||||
ovsdbDao.removeRadsecRadiusAndRealmConfigs(ovsdbClient);
|
||||
|
||||
if(needToPushConfigToAP) {
|
||||
pushConfigToAp(ovsdbClient, opensyncAPConfig, apId, configVersionFromProfiles);
|
||||
extIntegrationInterface.clearEquipmentStatus(apId);
|
||||
|
||||
ovsdbDao.configureNode(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureWifiRrm(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureGreTunnels(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.createVlanNetworkInterfaces(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureRadsecRadiusAndRealm(ovsdbClient, opensyncAPConfig);
|
||||
ovsdbDao.configureSsids(ovsdbClient, opensyncAPConfig);
|
||||
if (opensyncAPConfig.getHotspotConfig() != null) {
|
||||
ovsdbDao.configureHotspots(ovsdbClient, opensyncAPConfig);
|
||||
}
|
||||
|
||||
|
||||
ovsdbDao.configureInterfaces(ovsdbClient);
|
||||
ovsdbDao.configureWifiRadios(ovsdbClient, opensyncAPConfig);
|
||||
LOG.debug("Finished processConfigChanged for {}", apId);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -696,7 +626,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
List<OpensyncAPInetState> inetStateDelete = new ArrayList<>();
|
||||
|
||||
for (TableUpdate tableUpdate : tableUpdates.getTableUpdates().values()) {
|
||||
|
||||
|
||||
for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
|
||||
|
||||
if (rowUpdate.getNew() == null) {
|
||||
@@ -707,9 +637,9 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// delete first
|
||||
extIntegrationInterface.wifiInetStateDbTableDelete(inetStateDelete, key);
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateDelete, key);
|
||||
|
||||
// now process updates and mutations
|
||||
extIntegrationInterface.wifiInetStateDbTableUpdate(inetStateInsertOrUpdate, key);
|
||||
@@ -742,7 +672,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
private void monitorWifiVifStateDbTable(OvsdbClient ovsdbClient, String key) throws OvsdbClientException {
|
||||
|
||||
CompletableFuture<TableUpdates> vsCf = ovsdbClient.monitor(OvsdbDao.ovsdbName, OvsdbDao.wifiVifStateDbTable + "_" + key,
|
||||
new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(true, true, true, true)))),
|
||||
new MonitorRequests(ImmutableMap.of(OvsdbDao.wifiVifStateDbTable, new MonitorRequest(new MonitorSelect(false, true, true, true)))),
|
||||
tableUpdates -> {
|
||||
try {
|
||||
LOG.info(OvsdbDao.wifiVifStateDbTable + "_" + key + " monitor callback received {}", tableUpdates);
|
||||
@@ -780,19 +710,7 @@ public class TipWlanOvsdbClient implements OvsdbClientInterface {
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
try {
|
||||
List<OpensyncAPVIFState> vifsToInsert = new ArrayList<>();
|
||||
TableUpdates initialTableUpdates = vsCf.join();
|
||||
for (TableUpdate tableUpdate : initialTableUpdates.getTableUpdates().values()) {
|
||||
for (RowUpdate rowUpdate : tableUpdate.getRowUpdates().values()) {
|
||||
vifsToInsert.addAll(ovsdbDao.getOpensyncApVifStateForRowUpdate(rowUpdate, key, ovsdbClient));
|
||||
}
|
||||
}
|
||||
extIntegrationInterface.wifiVIFStateDbTableUpdate(vifsToInsert, key);
|
||||
} catch (Exception e) {
|
||||
LOG.error("initial wifiVIFStateDbTableUpdate failed", e);
|
||||
}
|
||||
vsCf.join();
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.telecominfraproject.wlan.opensync.ovsdb;
|
||||
|
||||
import java.security.cert.Certificate;
|
||||
import java.security.cert.X509Certificate;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
@@ -15,13 +14,13 @@ import com.netflix.servo.DefaultMonitorRegistry;
|
||||
import com.netflix.servo.monitor.BasicCounter;
|
||||
import com.netflix.servo.monitor.Counter;
|
||||
import com.netflix.servo.monitor.MonitorConfig;
|
||||
import com.netflix.servo.monitor.Monitors;
|
||||
import com.netflix.servo.tag.TagList;
|
||||
import com.telecominfraproject.wlan.cloudmetrics.CloudMetricsTags;
|
||||
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.OvsdbConnectionInfo;
|
||||
import com.vmware.ovsdb.service.OvsdbPassiveConnectionListener;
|
||||
|
||||
import io.netty.handler.ssl.SslContext;
|
||||
@@ -78,19 +77,11 @@ public class TipWlanOvsdbRedirector {
|
||||
ConnectionCallback connectionCallback = new ConnectionCallback() {
|
||||
public void connected(OvsdbClient ovsdbClient) {
|
||||
connectionsAttempted.increment();
|
||||
|
||||
String remoteHost = ovsdbClient.getConnectionInfo().getRemoteAddress().getHostAddress();
|
||||
int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
|
||||
String subjectDn = null;
|
||||
try {
|
||||
OvsdbConnectionInfo connectionInfo = ovsdbClient.getConnectionInfo();
|
||||
String remoteHost = connectionInfo.getRemoteAddress().getHostAddress();
|
||||
Certificate remoteCertificate = connectionInfo.getRemoteCertificate();
|
||||
if (remoteCertificate == null) {
|
||||
LOG.debug("Connect attempt no certificate from {} on remote port {}", remoteHost, connectionInfo.getRemotePort());
|
||||
return;
|
||||
}
|
||||
|
||||
int localPort = connectionInfo.getLocalPort();
|
||||
String subjectDn = null;
|
||||
subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
|
||||
subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
|
||||
|
||||
String clientCn = SslUtil.extractCN(subjectDn);
|
||||
LOG.info("ovsdbClient redirector connected from {} on port {} clientCn {}", remoteHost, localPort, clientCn);
|
||||
@@ -110,9 +101,7 @@ public class TipWlanOvsdbRedirector {
|
||||
int localPort = ovsdbClient.getConnectionInfo().getLocalPort();
|
||||
String subjectDn = null;
|
||||
try {
|
||||
Certificate remoteCertificate = ovsdbClient.getConnectionInfo().getRemoteCertificate();
|
||||
if (remoteCertificate != null)
|
||||
subjectDn = ((X509Certificate) remoteCertificate).getSubjectDN().getName();
|
||||
subjectDn = ((X509Certificate) ovsdbClient.getConnectionInfo().getRemoteCertificate()).getSubjectDN().getName();
|
||||
} catch (Exception e) {
|
||||
//do nothing
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ public class OvsdbDao extends OvsdbDaoBase {
|
||||
|
||||
public void configureCommands(OvsdbClient ovsdbClient, String startdebugengineapcommand,
|
||||
Map<String, String> payload, long l, long defaultCommandDurationSec) {
|
||||
ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
|
||||
ovsdbCommand.configureCommands(ovsdbClient, startdebugengineapcommand, payload, l, defaultCommandDurationSec);
|
||||
}
|
||||
|
||||
public void configureFirmwareDownload(OvsdbClient ovsdbClient, String apId, String firmwareUrl,
|
||||
@@ -86,17 +86,11 @@ public class OvsdbDao extends OvsdbDaoBase {
|
||||
ovsdbNetwork.configureInterfaces(ovsdbClient);
|
||||
}
|
||||
|
||||
public void configureWiredPort(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
ovsdbNetwork.configureEthernetPorts(ovsdbClient, opensyncAPConfig);
|
||||
}
|
||||
|
||||
public void configureNode(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
configureNtpServer(ovsdbClient, opensyncAPConfig);
|
||||
configureSyslog(ovsdbClient, opensyncAPConfig);
|
||||
processBlinkRequest(ovsdbClient, opensyncAPConfig.getCustomerEquipment().getInventoryId(),
|
||||
((ApElementConfiguration) opensyncAPConfig.getCustomerEquipment().getDetails()).isBlinkAllLEDs());
|
||||
ovsdbNodeConfig.processLedControlEnabled(ovsdbClient, opensyncAPConfig);
|
||||
processApcConfig(ovsdbClient, opensyncAPConfig);
|
||||
}
|
||||
|
||||
void configureNtpServer(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
@@ -211,10 +205,6 @@ public class OvsdbDao extends OvsdbDaoBase {
|
||||
public void removeAllInetConfigs(OvsdbClient ovsdbClient) {
|
||||
ovsdbNetwork.removeAllInetConfigs(ovsdbClient);
|
||||
}
|
||||
|
||||
public void resetWiredPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
|
||||
ovsdbNetwork.resetWiredPorts(ovsdbClient, opensyncApConfig);
|
||||
}
|
||||
|
||||
public void removeAllPasspointConfigs(OvsdbClient ovsdbClient) {
|
||||
ovsdbHotspot.removeAllPasspointConfigs(ovsdbClient);
|
||||
@@ -252,19 +242,7 @@ public class OvsdbDao extends OvsdbDaoBase {
|
||||
}
|
||||
|
||||
public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
|
||||
return ovsdbNodeConfig.processBlinkRequest(ovsdbClient, apId, blinkAllLEDs);
|
||||
}
|
||||
|
||||
public void processApcConfig(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
ovsdbNodeConfig.configureDynamicRadiusProxyToAPC(ovsdbClient, opensyncAPConfig);
|
||||
}
|
||||
|
||||
public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
|
||||
return ovsdbNode.getConfigVersionFromNode(ovsdbClient);
|
||||
}
|
||||
|
||||
public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
|
||||
ovsdbNode.updateConfigVersionInNode(ovsdbClient, configVersionFromProfiles);
|
||||
return ovsdbNodeConfig.processBlinkRequest(ovsdbClient,apId,blinkAllLEDs);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -40,26 +40,11 @@ public class OvsdbGet extends OvsdbDaoBase {
|
||||
Map<String, Set<Integer>> getAllowedChannels(OvsdbClient ovsdbClient) {
|
||||
Map<String, Set<Integer>> allowedChannels = new HashMap<>();
|
||||
for (Row row : getOvsdbTableRowsForCondition(ovsdbClient, wifiRadioStateDbTable, null)) {
|
||||
Set<Integer> channels = new HashSet<>();
|
||||
if (row.getMapColumn("channels").containsKey("allowed")) {
|
||||
for (String c : row.getMapColumn("channels").get("allowed").toString().split(",")) {
|
||||
if (c != null)
|
||||
channels.add(Integer.valueOf(c));
|
||||
} ;
|
||||
}
|
||||
if (row.getMapColumn("channels").containsKey("radar_detection")) {
|
||||
for (String c : row.getMapColumn("channels").get("radar_detection").toString().split(",")) {
|
||||
if (c != null)
|
||||
channels.add(Integer.valueOf(c));
|
||||
} ;
|
||||
}
|
||||
|
||||
allowedChannels.put(getSingleValueFromSet(row, "freq_band"), channels);
|
||||
allowedChannels.put(getSingleValueFromSet(row, "freq_band"), row.getSetColumn("allowed_channels"));
|
||||
}
|
||||
return allowedChannels;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get all Rows from given table that satisfy the conditions.
|
||||
*
|
||||
|
||||
@@ -93,8 +93,6 @@ public class OvsdbMonitor extends OvsdbDaoBase {
|
||||
if (rowUpdate.getOld() != null) {
|
||||
row = rowUpdate.getOld();
|
||||
row.getColumns().putAll(rowUpdate.getNew().getColumns());
|
||||
} else {
|
||||
row = rowUpdate.getNew();
|
||||
}
|
||||
} else {
|
||||
row = rowUpdate.getOld();
|
||||
|
||||
@@ -21,17 +21,10 @@ import org.springframework.stereotype.Component;
|
||||
import com.telecominfraproject.wlan.equipment.models.NetworkForwardMode;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiInetConfigInfo;
|
||||
import com.telecominfraproject.wlan.profile.ethernetport.models.WiredEthernetPortConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.ethernetport.models.WiredPort;
|
||||
import com.telecominfraproject.wlan.profile.models.Profile;
|
||||
import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceInterface;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredEthernetPortStatusData;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
|
||||
import com.telecominfraproject.wlan.status.models.Status;
|
||||
import com.telecominfraproject.wlan.status.models.StatusDataType;
|
||||
import com.vmware.ovsdb.exception.OvsdbClientException;
|
||||
import com.vmware.ovsdb.protocol.operation.Delete;
|
||||
import com.vmware.ovsdb.protocol.operation.Insert;
|
||||
@@ -52,18 +45,7 @@ import com.vmware.ovsdb.service.OvsdbClient;
|
||||
public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
|
||||
@Autowired
|
||||
private OvsdbGet ovsdbGet;
|
||||
@Autowired
|
||||
private StatusServiceInterface statusServiceInterface;
|
||||
|
||||
private static final String VLAN_IF_TYPE = "vlan";
|
||||
private static final String VLAN_TRUNK_IF_TYPE = "vlan_trunk";
|
||||
private static final String BRIDGE_IF_TYPE = "bridge";
|
||||
private static final String LAN_IF_NAME = "lan";
|
||||
private static final String WAN_IF_NAME = "wan";
|
||||
private static final int DEFAULT_MAX_INTERNAL_VLAN_ID = 2;
|
||||
private static final String SEPARATOR = " ";
|
||||
|
||||
OvsdbGet ovsdbGet;
|
||||
|
||||
void configureGreTunnel(OvsdbClient ovsdbClient, Profile apNetworkConfiguration) {
|
||||
try {
|
||||
@@ -110,7 +92,7 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
LOG.info("configureGreTunnel {}", ((UpdateResult) res).toString());
|
||||
} else if (res instanceof ErrorResult) {
|
||||
LOG.error("configureGreTunnel error {}", (res));
|
||||
throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError() + SEPARATOR
|
||||
throw new RuntimeException("configureGreTunnel " + ((ErrorResult) res).getError() + " "
|
||||
+ ((ErrorResult) res).getDetails());
|
||||
}
|
||||
}
|
||||
@@ -155,242 +137,10 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
} else {
|
||||
operations.add(new Insert(wifiInetConfigDbTable, row));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void configureEthernetPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
|
||||
Profile wiredEthernetPortProfile = opensyncApConfig.getWiredEthernetPortProfile();
|
||||
|
||||
if (wiredEthernetPortProfile != null) {
|
||||
LOG.debug("Entering configure Ethernet Ports for wiredEthernetPortProfile {} for equipment {}",
|
||||
wiredEthernetPortProfile, opensyncApConfig.getCustomerEquipment().getId());
|
||||
// Getting the config from the UI
|
||||
WiredEthernetPortConfiguration ethernetPortConfig = (WiredEthernetPortConfiguration) wiredEthernetPortProfile
|
||||
.getDetails();
|
||||
LOG.debug("Configure EthernetPorts {}", ethernetPortConfig);
|
||||
Set<WiredPort> desiredWiredPorts = ethernetPortConfig.getEthPorts();
|
||||
|
||||
handleEthernetPortConfiguration(ovsdbClient, desiredWiredPorts);
|
||||
|
||||
} else {
|
||||
LOG.info("opensyncApConfig for Customer {}, Equipment {} has no wiredEthernetPortProfile attached" ,
|
||||
opensyncApConfig.getCustomerEquipment().getCustomerId(), opensyncApConfig.getCustomerEquipment().getId());
|
||||
}
|
||||
}
|
||||
|
||||
private void handleEthernetPortConfiguration(OvsdbClient ovsdbClient, Set<WiredPort> desiredWiredPorts) {
|
||||
// lists are for more than one lan port moving to wan ("eth0 eth1 eth2")
|
||||
Set<String> availableLanEthNames = new HashSet<>();
|
||||
Set<String> availableWanEthNames = new HashSet<>();
|
||||
if (desiredWiredPorts == null) {
|
||||
LOG.info("Cannot handle the EthernetPort config for null desired Wired Ports. Exiting");
|
||||
return;
|
||||
}
|
||||
LOG.debug("In handleEthernetPortConfiguration with desiredWiredPorts {}", desiredWiredPorts);
|
||||
WiredPort wanPort = getDefaultWanPort(desiredWiredPorts);
|
||||
if (wanPort == null) {
|
||||
LOG.error("Cannot find the default wan port from the desired list of ports {}" , desiredWiredPorts);
|
||||
return;
|
||||
}
|
||||
for (WiredPort port: desiredWiredPorts) {
|
||||
if (port.getIfName().contains(LAN_IF_NAME)) { // for AP has ifName lan1, lan2 instead of lan
|
||||
availableLanEthNames.add(port.getName());
|
||||
} else if (WAN_IF_NAME.equals(port.getIfName())) {
|
||||
availableWanEthNames.add(port.getName());
|
||||
}
|
||||
}
|
||||
for (WiredPort desiredPort : desiredWiredPorts) {
|
||||
if (!desiredPort.equals(wanPort)) {
|
||||
if (isLanToBridgeConversion(desiredPort) && !desiredPort.isTrunkEnabled()) {
|
||||
// Flow 1: Desired Bridge + Access
|
||||
LOG.debug("Desired Config is Bridge with Access Mode");
|
||||
availableLanEthNames.remove(desiredPort.getName());
|
||||
availableWanEthNames.add(desiredPort.getName());
|
||||
changeLanToWan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
|
||||
createVlanTag(ovsdbClient, desiredPort);
|
||||
} else if (isLanToBridgeConversion(desiredPort) && desiredPort.isTrunkEnabled()) {
|
||||
// Flow 2: Desired Bridge + Trunk
|
||||
LOG.debug("Desired Config is Bridge with Trunk Mode");
|
||||
availableLanEthNames.remove(desiredPort.getName());
|
||||
availableWanEthNames.add(desiredPort.getName());
|
||||
changeLanToWan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
|
||||
createTrunkInterface(ovsdbClient, desiredPort);
|
||||
} else if (!BRIDGE_IF_TYPE.equalsIgnoreCase(desiredPort.getIfType())) {
|
||||
// Flow 3: Desired ifType is NAT
|
||||
LOG.debug("Desired Config is NAT (LAN) mode. Desired Port {} may still be tagged to WAN interface. Convert to LAN mode", desiredPort.getIfName());
|
||||
availableLanEthNames.add(desiredPort.getName());
|
||||
availableWanEthNames.remove(desiredPort.getName());
|
||||
changeWanToLan(ovsdbClient, availableLanEthNames, availableWanEthNames, wanPort.getName());
|
||||
} else {
|
||||
LOG.info("Not a supported Config change requested for the port {}", desiredPort);
|
||||
}
|
||||
} else {
|
||||
LOG.error("It's the default WAN port. No changes needed!");
|
||||
}
|
||||
} // end of for loop
|
||||
}
|
||||
|
||||
private String generateInterfaceId(String portName, int vlanId, boolean trunk) {
|
||||
if (!trunk) {
|
||||
return String.format("%s_%s", portName, vlanId);
|
||||
} else {
|
||||
return String.format("%s_trunk", portName);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isLanToBridgeConversion(WiredPort desiredPort) {
|
||||
return LAN_IF_NAME.equalsIgnoreCase(desiredPort.getIfName()) &&
|
||||
BRIDGE_IF_TYPE.equals(desiredPort.getIfType());
|
||||
}
|
||||
|
||||
WiredPort getDefaultWanPort(Set<WiredPort> desiredPorts) {
|
||||
WiredPort wanWiredPort = desiredPorts.stream()
|
||||
.filter(entry -> WAN_IF_NAME.equals(entry.getIfName())).findFirst().orElse(null);
|
||||
|
||||
LOG.debug("Returning wanWiredPort {}", wanWiredPort);
|
||||
return wanWiredPort;
|
||||
}
|
||||
|
||||
void changeLanToWan(OvsdbClient ovsdbClient, Set<String> lanPortsToUpdate, Set<String> wanPortsToUpdate, String wanEthName) {
|
||||
LOG.debug("Calling changeLanToWan: moving port {} to LAN and {} to WAN", lanPortsToUpdate, wanPortsToUpdate);
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
// Step1: remove lan from eth_ports
|
||||
// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:=" " -w if_name==lan
|
||||
// or cases like: /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth2" -w if_name==lan
|
||||
String lanPortsString = String.join(SEPARATOR, lanPortsToUpdate);
|
||||
addEthPortsOperation(operations, lanPortsString.equals("")? SEPARATOR : lanPortsString, LAN_IF_NAME);
|
||||
|
||||
// Step2: make lan to a wan port
|
||||
// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth0 eth1" -w if_name==wan
|
||||
// eth_ports syntax is set by AP (i.e, eth0 eth1)
|
||||
// AP needs the original wan port be the first port in the string. Since we will hard code it, we remove
|
||||
// original wan name from the set to avoid duplication
|
||||
wanPortsToUpdate.remove(wanEthName);
|
||||
// trim() is used when wanPortsToUpdate is empty (i.e. we want "eth0" instead of "eth0 ")
|
||||
addEthPortsOperation(operations, (wanEthName + SEPARATOR + String.join(SEPARATOR, wanPortsToUpdate)).trim(), WAN_IF_NAME);
|
||||
sendOperationsToAP(ovsdbClient, operations, "changeLanToWan");
|
||||
}
|
||||
|
||||
private void createVlanTag(OvsdbClient ovsdbClient, WiredPort desiredWiredPort) {
|
||||
LOG.debug("Creating a new VlanInterface for wiredPort {}", desiredWiredPort);
|
||||
if (desiredWiredPort.getVlanId() > DEFAULT_MAX_INTERNAL_VLAN_ID) {
|
||||
// Tag to vlan
|
||||
// /usr/opensync/bin/ovsh i Wifi_Inet_Config NAT:=true enabled:=true
|
||||
// if_name:=eth0_100 if_type:=vlan ip_assign_scheme:=none network:=true
|
||||
// parent_ifname:=eth0 vlan_id:=100 dhcp_sniff:=false eth_ports:="eth0"
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
Map<String, Value> tableColumns = new HashMap<>();
|
||||
tableColumns.put("NAT", new Atom<>(true));
|
||||
tableColumns.put("enabled", new Atom<>(true));
|
||||
tableColumns.put("if_name", new Atom<>(generateInterfaceId(desiredWiredPort.getName(), desiredWiredPort.getVlanId(), false)));
|
||||
tableColumns.put("if_type", new Atom<>(VLAN_IF_TYPE));
|
||||
tableColumns.put("ip_assign_scheme", new Atom<>("none"));
|
||||
tableColumns.put("network", new Atom<>(true));
|
||||
tableColumns.put("parent_ifname", new Atom<>(desiredWiredPort.getName()));
|
||||
tableColumns.put("vlan_id", new Atom<>(desiredWiredPort.getVlanId()));
|
||||
tableColumns.put("dhcp_sniff", new Atom<>(false));
|
||||
tableColumns.put("eth_ports", new Atom<>(desiredWiredPort.getName()));
|
||||
Row row = new Row(tableColumns);
|
||||
operations.add(new Insert(wifiInetConfigDbTable, row));
|
||||
|
||||
sendOperationsToAP(ovsdbClient, operations, "createVlanTag");
|
||||
} else {
|
||||
LOG.info("Desired vlanId {} is lower than default {}; no tagging needed",
|
||||
desiredWiredPort.getVlanId(), DEFAULT_MAX_INTERNAL_VLAN_ID);
|
||||
}
|
||||
}
|
||||
|
||||
private void createTrunkInterface(OvsdbClient ovsdbClient, WiredPort desiredWiredPort) {
|
||||
LOG.debug("Creating a new TrunkInterface for wiredPort {}", desiredWiredPort);
|
||||
|
||||
// Create Trunk Interface
|
||||
// /usr/opensync/bin/ovsh i Wifi_Inet_Config NAT:=true enabled:=true
|
||||
// if_name:=eth0_trunk if_type:=vlan_trunk ip_assign_scheme:=none network:=true
|
||||
// parent_ifname:=eth0 dhcp_sniff:=false eth_ports:="eth0"
|
||||
// vlan_trunk:='["map",[["allowed_vlans","100 200 300"],["pvid","10"]]]'
|
||||
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
Map<String, Value> tableColumns = new HashMap<>();
|
||||
tableColumns.put("NAT", new Atom<>(true));
|
||||
tableColumns.put("enabled", new Atom<>(true));
|
||||
tableColumns.put("if_name", new Atom<>(generateInterfaceId(desiredWiredPort.getName(), desiredWiredPort.getVlanId(), true)));
|
||||
tableColumns.put("if_type", new Atom<>(VLAN_TRUNK_IF_TYPE));
|
||||
tableColumns.put("ip_assign_scheme", new Atom<>("none"));
|
||||
tableColumns.put("network", new Atom<>(true));
|
||||
tableColumns.put("parent_ifname", new Atom<>(desiredWiredPort.getName()));
|
||||
tableColumns.put("dhcp_sniff", new Atom<>(false));
|
||||
tableColumns.put("eth_ports", new Atom<>(desiredWiredPort.getName()));
|
||||
|
||||
Map<String, String> vlanTrunkMap = new HashMap<>();
|
||||
|
||||
if (desiredWiredPort.getAllowedVlanIds() != null) {
|
||||
vlanTrunkMap.put("allowed_vlans", getAllowedVlanAsString(desiredWiredPort));
|
||||
if (desiredWiredPort.getVlanId() > DEFAULT_MAX_INTERNAL_VLAN_ID) {
|
||||
vlanTrunkMap.put("pvid", String.valueOf(desiredWiredPort.getVlanId()));
|
||||
}
|
||||
}
|
||||
|
||||
com.vmware.ovsdb.protocol.operation.notation.Map<String, String> vlanTrunkVal = com.vmware.ovsdb.protocol.operation.notation.Map.of(vlanTrunkMap);
|
||||
|
||||
tableColumns.put(VLAN_TRUNK_IF_TYPE, vlanTrunkVal);
|
||||
Row row = new Row(tableColumns);
|
||||
operations.add(new Insert(wifiInetConfigDbTable, row));
|
||||
|
||||
sendOperationsToAP(ovsdbClient, operations, "createTrunkInterface");
|
||||
|
||||
}
|
||||
|
||||
private String getAllowedVlanAsString(WiredPort desiredWiredPort) {
|
||||
return desiredWiredPort.getAllowedVlanIds().stream().map(String::valueOf).collect(Collectors.joining(SEPARATOR));
|
||||
}
|
||||
|
||||
void changeWanToLan(OvsdbClient ovsdbClient, Set<String> lanPortsToUpdate, Set<String> wanPortsToUpdate, String wanEthName) {
|
||||
LOG.debug("Calling changeWanToLan: Moving port {} to LAN and {} to WAN", lanPortsToUpdate, wanPortsToUpdate);
|
||||
// Step1: set the correct port to lan
|
||||
// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth0" -w if_name==lan
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
addEthPortsOperation(operations, String.join(SEPARATOR, lanPortsToUpdate), LAN_IF_NAME);
|
||||
|
||||
// Step2: set the correct port to wan
|
||||
// /usr/opensync/bin/ovsh u Wifi_Inet_Config eth_ports:="eth1" -w if_name==wan
|
||||
// AP needs the original wan port be the first port in the string. Since we will hard code it, we remove
|
||||
// original wan name from the set to avoid duplication
|
||||
wanPortsToUpdate.remove(wanEthName);
|
||||
addEthPortsOperation(operations, (wanEthName + SEPARATOR + String.join(SEPARATOR, wanPortsToUpdate)).trim(), WAN_IF_NAME);
|
||||
|
||||
sendOperationsToAP(ovsdbClient, operations, "changeWanToLan");
|
||||
}
|
||||
|
||||
void addEthPortsOperation(List<Operation> operations, String ethPorts, String ifName) {
|
||||
Map<String, Value> tableColumn = new HashMap<>();
|
||||
tableColumn.put("eth_ports", new Atom<>(ethPorts));
|
||||
Row row = new Row(tableColumn);
|
||||
operations.add(new Update(wifiInetConfigDbTable,
|
||||
List.of(new Condition("if_name", Function.EQUALS, new Atom<>(ifName))), row));
|
||||
}
|
||||
|
||||
void sendOperationsToAP(OvsdbClient ovsdbClient, List<Operation> operations, String methodName) {
|
||||
try {
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
for (OperationResult res : result) {
|
||||
if (res instanceof InsertResult) {
|
||||
LOG.info("{} - {}", methodName, res);
|
||||
} else if (res instanceof UpdateResult) {
|
||||
LOG.info("{} {}", methodName, res);
|
||||
} else if (res instanceof ErrorResult) {
|
||||
LOG.error("{} {}", methodName, res);
|
||||
throw new RuntimeException("createVlanNetworkInterfaces - " + ((ErrorResult) res).getError() + SEPARATOR
|
||||
+ ((ErrorResult) res).getDetails());
|
||||
}
|
||||
}
|
||||
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ovsdbClient
|
||||
* @param ovsdbClient
|
||||
* @param vifInterfaceName
|
||||
* @param enabled
|
||||
* @param networkForwardMode
|
||||
@@ -443,7 +193,7 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
LOG.info("createVlanNetworkInterfaces {}", ((UpdateResult) res).toString());
|
||||
} else if (res instanceof ErrorResult) {
|
||||
LOG.error("createVlanNetworkInterfaces error {}", (res));
|
||||
throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + SEPARATOR
|
||||
throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + " "
|
||||
+ ((ErrorResult) res).getDetails());
|
||||
}
|
||||
}
|
||||
@@ -462,8 +212,34 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
Map<String, Value> tableColumns = new HashMap<>();
|
||||
Map<String, WifiInetConfigInfo> inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
|
||||
WifiInetConfigInfo parentLanInterface = inetConfigMap.get(defaultLanInterfaceName);
|
||||
if (parentLanInterface == null) {
|
||||
throw new RuntimeException(
|
||||
"Cannot get lan interface " + defaultLanInterfaceName + " for vlan " + vlanId);
|
||||
}
|
||||
tableColumns.put("if_type", new Atom<>("vlan"));
|
||||
tableColumns.put("vlan_id", new Atom<>(vlanId));
|
||||
tableColumns.put("if_name", new Atom<>(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
|
||||
tableColumns.put("parent_ifname", new Atom<>(parentLanInterface.ifName));
|
||||
tableColumns.put("enabled", new Atom<>(true));
|
||||
tableColumns.put("network", new Atom<>(true));
|
||||
tableColumns.put("ip_assign_scheme", new Atom<>(parentLanInterface.ipAssignScheme));
|
||||
tableColumns.put("NAT", new Atom<>(parentLanInterface.nat));
|
||||
tableColumns.put("mtu", new Atom<>(1500));
|
||||
String[] inetAddress = parentLanInterface.inetAddr.split("\\.");
|
||||
String vlanAddress = inetAddress[0] + "." + inetAddress[1] + "." + vlanId + "." + inetAddress[3];
|
||||
tableColumns.put("inet_addr", new Atom<>(vlanAddress));
|
||||
tableColumns.put("netmask", new Atom<>(parentLanInterface.netmask));
|
||||
tableColumns.put("dhcpd", com.vmware.ovsdb.protocol.operation.notation.Map.of(parentLanInterface.dhcpd));
|
||||
Row row = new Row(tableColumns);
|
||||
|
||||
if (inetConfigMap.containsKey(parentLanInterface.ifName + "_" + Integer.toString(vlanId))) {
|
||||
List<Condition> conditions = new ArrayList<>();
|
||||
conditions.add(new Condition("vlan_id", Function.EQUALS, new Atom<>(vlanId)));
|
||||
conditions.add(new Condition("parent_ifname", Function.EQUALS, new Atom<>(parentLanInterface.ifName)));
|
||||
operations.add(new Update(wifiInetConfigDbTable, conditions, row));
|
||||
} else {
|
||||
operations.add(new Insert(wifiInetConfigDbTable, row));
|
||||
}
|
||||
WifiInetConfigInfo parentWanInterface = inetConfigMap.get(defaultWanInterfaceName);
|
||||
if (parentWanInterface == null) {
|
||||
throw new RuntimeException(
|
||||
@@ -475,7 +251,8 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
tableColumns.put("if_name", new Atom<>(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
|
||||
tableColumns.put("parent_ifname", new Atom<>(parentWanInterface.ifName));
|
||||
tableColumns.put("enabled", new Atom<>(true));
|
||||
tableColumns.put("ip_assign_scheme", new Atom<>("none"));
|
||||
tableColumns.put("network", new Atom<>(true));
|
||||
tableColumns.put("ip_assign_scheme", new Atom<>(parentWanInterface.ipAssignScheme));
|
||||
tableColumns.put("NAT", new Atom<>(parentWanInterface.nat));
|
||||
tableColumns.put("mtu", new Atom<>(1500));
|
||||
row = new Row(tableColumns);
|
||||
@@ -495,13 +272,14 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
LOG.info("createVlanNetworkInterfaces {}", ((UpdateResult) res).toString());
|
||||
} else if (res instanceof ErrorResult) {
|
||||
LOG.error("createVlanNetworkInterfaces error {}", (res));
|
||||
throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + SEPARATOR
|
||||
throw new RuntimeException("createVlanNetworkInterfaces " + ((ErrorResult) res).getError() + " "
|
||||
+ ((ErrorResult) res).getDetails());
|
||||
}
|
||||
}
|
||||
inetConfigMap = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient);
|
||||
LOG.debug("Provisioned vlan on wan {} and lan {}",
|
||||
inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)));
|
||||
inetConfigMap.get(parentWanInterface.ifName + "_" + Integer.toString(vlanId)),
|
||||
inetConfigMap.get(parentLanInterface.ifName + "_" + Integer.toString(vlanId)));
|
||||
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
|
||||
LOG.error("Error in provisioning Vlan", e);
|
||||
throw new RuntimeException(e);
|
||||
@@ -538,34 +316,33 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
Collection<WifiInetConfigInfo> provisionedWifiInetConfigs = ovsdbGet
|
||||
.getProvisionedWifiInetConfigs(ovsdbClient).values();
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
List<Condition> conditions = new ArrayList<>();
|
||||
for (WifiInetConfigInfo wifiInetConfigInfo : provisionedWifiInetConfigs) {
|
||||
if (wifiInetConfigInfo.vlanId > 1
|
||||
|| wifiInetConfigInfo.ifType.equals("vif")
|
||||
|| wifiInetConfigInfo.ifName.startsWith("gre") || wifiInetConfigInfo.ifType.equals("gre")
|
||||
|| VLAN_IF_TYPE.equalsIgnoreCase(wifiInetConfigInfo.ifType) // Remove any existing vlan/vlan_trunk tagging
|
||||
|| VLAN_TRUNK_IF_TYPE.equalsIgnoreCase(wifiInetConfigInfo.ifType) ) {
|
||||
List<Condition> conditions = new ArrayList<>();
|
||||
if (wifiInetConfigInfo.vlanId > 1 || wifiInetConfigInfo.ifType.equals("vif")
|
||||
|| wifiInetConfigInfo.ifName.startsWith("gre") || wifiInetConfigInfo.ifType.equals("gre")) {
|
||||
conditions = new ArrayList<>();
|
||||
conditions.add(new Condition("if_name", Function.EQUALS, new Atom<>(wifiInetConfigInfo.ifName)));
|
||||
operations.add(new Delete(wifiInetConfigDbTable, conditions));
|
||||
}
|
||||
}
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
LOG.info("Removed all existing vif, vlan, vlan_trunk and gre interface configs from {}:", wifiInetConfigDbTable);
|
||||
LOG.info("Removed all existing vif, vlan, and gre interface configs from {}:", wifiInetConfigDbTable);
|
||||
for (OperationResult res : result) {
|
||||
LOG.info("Op Result {}", res);
|
||||
}
|
||||
provisionedWifiInetConfigs = ovsdbGet.getProvisionedWifiInetConfigs(ovsdbClient).values();
|
||||
for (WifiInetConfigInfo inetConfigInfo : provisionedWifiInetConfigs) {
|
||||
if (inetConfigInfo.ifType.equals("vif") || inetConfigInfo.ifType.equals("gre") ||
|
||||
VLAN_IF_TYPE.equals(inetConfigInfo.ifType) || VLAN_TRUNK_IF_TYPE.equals(inetConfigInfo.ifType)) {
|
||||
if (inetConfigInfo.ifType.equals("vif") || inetConfigInfo.ifType.equals("gre")) {
|
||||
throw new RuntimeException(
|
||||
"Failed to remove all vif, gre, vlan interface configurations from Wifi_Inet_Config dbTable, still has "
|
||||
"Failed to remove all vif and gre interface configurations from Wifi_Inet_Config dbTable, still has "
|
||||
+ provisionedWifiInetConfigs.stream().filter(new Predicate<WifiInetConfigInfo>() {
|
||||
@Override
|
||||
public boolean test(WifiInetConfigInfo t) {
|
||||
return (t.ifType.equals("vif")) || (t.ifType.equals("gre")) ||
|
||||
VLAN_IF_TYPE.equals(t.ifType) || VLAN_TRUNK_IF_TYPE.equals(t.ifType);
|
||||
if ((t.ifType.equals("vif")) || (t.ifType.equals("gre"))) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}).collect(Collectors.toList()));
|
||||
|
||||
@@ -576,56 +353,4 @@ public class OvsdbNetworkConfig extends OvsdbDaoBase {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
// Reset all LAN ports from WAN back to LAN (NAT mode)
|
||||
void resetWiredPorts(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncApConfig) {
|
||||
LOG.debug("Calling resetWiredPorts");
|
||||
// e.g. eth1
|
||||
Map<String, List<WiredPortStatus>> interfacePortStatusMap = getInterfacePortStatus(
|
||||
opensyncApConfig.getCustomerEquipment().getCustomerId(),
|
||||
opensyncApConfig.getCustomerEquipment().getId());
|
||||
if (interfacePortStatusMap == null) {
|
||||
LOG.info("No InterfacePort(EthernetPort) Status. Exiting");
|
||||
return;
|
||||
}
|
||||
List<WiredPortStatus> wanPortStatusList = interfacePortStatusMap.get(WAN_IF_NAME);
|
||||
if (wanPortStatusList == null) {
|
||||
LOG.info("No wan interface status available. Exiting");
|
||||
return;
|
||||
}
|
||||
WiredPortStatus originalWanPortStatus = wanPortStatusList.stream()
|
||||
.filter(wan -> WAN_IF_NAME.equals(wan.getOriginalIfName())).findFirst().orElse(null);
|
||||
if (originalWanPortStatus == null) {
|
||||
LOG.info("No original wan port available. Exiting");
|
||||
return;
|
||||
}
|
||||
String wanEthName = originalWanPortStatus.getName();
|
||||
Set<String> lanEthNames = new HashSet<>();
|
||||
for (WiredPortStatus wanPortStatus : wanPortStatusList) {
|
||||
if (wanPortStatus.getOriginalIfName().contains(LAN_IF_NAME)) {
|
||||
lanEthNames.add(wanPortStatus.getName());
|
||||
}
|
||||
}
|
||||
if (!lanEthNames.isEmpty()) {
|
||||
Set<String> wanEthNameSet = new HashSet<String>();
|
||||
wanEthNameSet.add(wanEthName);
|
||||
changeWanToLan(ovsdbClient, lanEthNames, wanEthNameSet, wanEthName);
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, List<WiredPortStatus>> getInterfacePortStatus(int customerId, long equipmentId) {
|
||||
Map<String, List<WiredPortStatus>> interfacePortStatus = null;
|
||||
// Getting the status from the current AP
|
||||
Status existingPortStatus = statusServiceInterface.getOrNull(customerId, equipmentId,
|
||||
StatusDataType.WIRED_ETHERNET_PORT);
|
||||
if (existingPortStatus != null && existingPortStatus.getDetails() instanceof WiredEthernetPortStatusData) {
|
||||
interfacePortStatus = ((WiredEthernetPortStatusData) existingPortStatus.getDetails())
|
||||
.getInterfacePortStatusMap();
|
||||
}
|
||||
|
||||
if (interfacePortStatus == null || interfacePortStatus.isEmpty()) {
|
||||
LOG.info("No ethernetPortStatus found for customer {}, equipment {}", customerId, equipmentId);
|
||||
}
|
||||
return interfacePortStatus;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -417,96 +417,4 @@ public class OvsdbNode extends OvsdbDaoBase {
|
||||
return ret;
|
||||
}
|
||||
|
||||
public long getConfigVersionFromNode(OvsdbClient ovsdbClient) {
|
||||
|
||||
long ret = 0;
|
||||
|
||||
Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
|
||||
|
||||
try {
|
||||
ret = Long.parseLong(versionMatrix.get(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME));
|
||||
} catch(Exception e) {
|
||||
//do nothing
|
||||
}
|
||||
|
||||
LOG.debug("getConfigVersionFromNode {}", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
public Map<String, String> getVersionMatrixFromNode(OvsdbClient ovsdbClient) {
|
||||
|
||||
Map<String, String> ret = new HashMap<>();
|
||||
|
||||
try {
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
List<Condition> conditions = new ArrayList<>();
|
||||
List<String> columns = new ArrayList<>();
|
||||
columns.add("version_matrix");
|
||||
columns.add("id");
|
||||
|
||||
operations.add(new Select(awlanNodeDbTable, conditions, columns));
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Select from {}:", awlanNodeDbTable);
|
||||
|
||||
for (OperationResult res : result) {
|
||||
LOG.debug("Op Result {}", res);
|
||||
}
|
||||
}
|
||||
|
||||
Row row = null;
|
||||
if ((result != null) && (result.length > 0) && (result[0] instanceof SelectResult) && !((SelectResult) result[0]).getRows().isEmpty()) {
|
||||
row = ((SelectResult) result[0]).getRows().iterator().next();
|
||||
}
|
||||
|
||||
if( row != null ) {
|
||||
ret = row.getMapColumn("version_matrix");
|
||||
}
|
||||
|
||||
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
LOG.debug("getVersionMatrixFromNode {}", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
public void updateConfigVersionInNode(OvsdbClient ovsdbClient, long configVersionFromProfiles) {
|
||||
|
||||
try {
|
||||
//get original version_matrix map value
|
||||
Map<String, String> versionMatrix = getVersionMatrixFromNode(ovsdbClient);
|
||||
|
||||
//update our config version in version_matrix map
|
||||
versionMatrix.put(ConnectNodeInfo.CONFIG_VERSION_PROPERTY_NAME, Long.toString(configVersionFromProfiles));
|
||||
|
||||
//update the version_matrix column
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
Map<String, Value> updateColumns = new HashMap<>();
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
com.vmware.ovsdb.protocol.operation.notation.Map<String, String> ovsdbVersionMatrix =
|
||||
com.vmware.ovsdb.protocol.operation.notation.Map.of(versionMatrix);
|
||||
updateColumns.put("version_matrix", ovsdbVersionMatrix);
|
||||
|
||||
Row row = new Row(updateColumns);
|
||||
operations.add(new Update(awlanNodeDbTable, row));
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
|
||||
for (OperationResult r : result) {
|
||||
LOG.debug("Op Result {}", r);
|
||||
}
|
||||
|
||||
LOG.debug("updateConfigVersionInNode {}", configVersionFromProfiles);
|
||||
|
||||
} catch (OvsdbClientException | TimeoutException | ExecutionException | InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
package com.telecominfraproject.wlan.opensync.ovsdb.dao;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -15,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.telecominfraproject.wlan.opensync.ovsdb.dao.models.WifiVifConfigInfo;
|
||||
import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
|
||||
import com.vmware.ovsdb.exception.OvsdbClientException;
|
||||
import com.vmware.ovsdb.protocol.operation.Delete;
|
||||
@@ -27,7 +25,6 @@ import com.vmware.ovsdb.protocol.operation.notation.Condition;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Function;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Row;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Value;
|
||||
import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.InsertResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.OperationResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
|
||||
@@ -123,71 +120,24 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
|
||||
|
||||
}
|
||||
|
||||
public void processLedControlEnabled(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
try {
|
||||
Map<String, Value> columns = new HashMap<>();
|
||||
ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
|
||||
.getDetails();
|
||||
if (apNetworkConfig.isLedControlEnabled() == null) {
|
||||
LOG.info("Cannot configure isLedControlEnabled to null value. {}", apNetworkConfig);
|
||||
return;
|
||||
}
|
||||
if (apNetworkConfig.isLedControlEnabled()) {
|
||||
columns.put("module", new Atom<>("led"));
|
||||
columns.put("key", new Atom<>("led_state"));
|
||||
columns.put("value", new Atom<>("on"));
|
||||
} else {
|
||||
columns.put("module", new Atom<>("led"));
|
||||
columns.put("key", new Atom<>("led_state"));
|
||||
columns.put("value", new Atom<>("off"));
|
||||
}
|
||||
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
operations.add(new Update(nodeConfigTable,
|
||||
List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
long numUpdates = 0;
|
||||
for (OperationResult res : result) {
|
||||
if (res instanceof UpdateResult) {
|
||||
numUpdates += ((UpdateResult) res).getCount();
|
||||
LOG.debug("processLedControlEnabled update result {}", res);
|
||||
}
|
||||
}
|
||||
if (numUpdates == 0) {
|
||||
// no records existed, insert the row instead
|
||||
operations.clear();
|
||||
operations.add(new Insert(nodeConfigTable, new Row(columns)));
|
||||
fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
for (OperationResult res : result) {
|
||||
if (res instanceof InsertResult) {
|
||||
LOG.debug("processLedControlEnabled insert result {}", res);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
|
||||
public String processBlinkRequest(OvsdbClient ovsdbClient, String apId, boolean blinkAllLEDs) {
|
||||
|
||||
String ret = null;
|
||||
try {
|
||||
|
||||
LOG.debug("processLEDRequest set LEDs status to {}", blinkAllLEDs ? "led_blink" : "led_state");
|
||||
LOG.debug("processBlinkRequest set BlinkLEDs to {}", blinkAllLEDs);
|
||||
Map<String, Value> columns = new HashMap<>();
|
||||
if (blinkAllLEDs) {
|
||||
columns.put("module", new Atom<>("led"));
|
||||
columns.put("key", new Atom<>("led_blink"));
|
||||
columns.put("value", new Atom<>("on"));
|
||||
} else {
|
||||
columns.put("module", new Atom<>("led"));
|
||||
columns.put("key", new Atom<>("led_state"));
|
||||
columns.put("key", new Atom<>("led_off"));
|
||||
columns.put("value", new Atom<>("off"));
|
||||
}
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
operations.add(new Update(nodeConfigTable,
|
||||
List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
|
||||
operations.add(new Update(nodeConfigTable, List.of(new Condition("module", Function.EQUALS, new Atom<>("led"))), new Row(columns)));
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
long numUpdates = 0;
|
||||
@@ -211,37 +161,10 @@ public class OvsdbNodeConfig extends OvsdbDaoBase {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return ret;
|
||||
} catch (OvsdbClientException | InterruptedException | ExecutionException | TimeoutException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void configureDynamicRadiusProxyToAPC(OvsdbClient ovsdbClient, OpensyncAPConfig opensyncAPConfig) {
|
||||
|
||||
ApNetworkConfiguration apNetworkConfig = (ApNetworkConfiguration) opensyncAPConfig.getApProfile()
|
||||
.getDetails();
|
||||
if (apNetworkConfig.isDynamicRadiusProxyEnabled() == null) {
|
||||
LOG.info("Cannot configure isDynamicRadiusProxyEnabled to null value. {}", apNetworkConfig);
|
||||
return;
|
||||
}
|
||||
Boolean isApcEnabled = apNetworkConfig.isDynamicRadiusProxyEnabled();
|
||||
|
||||
try {
|
||||
if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
|
||||
Map<String, Value> columns = new HashMap<>();
|
||||
columns.put("enabled", new Atom<>(isApcEnabled));
|
||||
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
operations.add(new Update(apcConfigDbTable, new Row(columns)));
|
||||
CompletableFuture<OperationResult[]> fResult = ovsdbClient.transact(ovsdbName, operations);
|
||||
OperationResult[] result = fResult.get(ovsdbTimeoutSec, TimeUnit.SECONDS);
|
||||
LOG.debug("configureDynamicRadiusProxyToAPC result {} ", Arrays.toString(result));
|
||||
}
|
||||
} catch (InterruptedException | ExecutionException | OvsdbClientException | TimeoutException e) {
|
||||
LOG.error("Unable to configureDynamicRadiusProxyToAPC on AP.", e);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ import com.vmware.ovsdb.exception.OvsdbClientException;
|
||||
import com.vmware.ovsdb.protocol.operation.Delete;
|
||||
import com.vmware.ovsdb.protocol.operation.Insert;
|
||||
import com.vmware.ovsdb.protocol.operation.Operation;
|
||||
import com.vmware.ovsdb.protocol.operation.Update;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Atom;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Row;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Set;
|
||||
@@ -36,6 +37,24 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
|
||||
@Autowired
|
||||
OvsdbGet getProvisionedData;
|
||||
|
||||
void configureApc(OvsdbClient ovsdbClient, Boolean enable, List<Operation> operations) {
|
||||
try {
|
||||
if (ovsdbClient.getSchema(ovsdbName).get().getTables().containsKey(apcConfigDbTable)) {
|
||||
Map<String, Value> updateColumns = new HashMap<>();
|
||||
updateColumns.put("enabled", new Atom<>(enable));
|
||||
Row row = new Row(updateColumns);
|
||||
Update update = new Update(apcConfigDbTable, row);
|
||||
if (!operations.contains(update)) {
|
||||
// only need to do 1 update of this kind
|
||||
operations.add(new Update(apcConfigDbTable, row));
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException | ExecutionException | OvsdbClientException e) {
|
||||
LOG.error("Exception getting schema for ovsdb.", e);
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
void configureRadius(OvsdbClient ovsdbClient, OpensyncAPConfig apConfig) {
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
try {
|
||||
@@ -99,14 +118,11 @@ public class OvsdbRadiusProxyConfig extends OvsdbDaoBase {
|
||||
updateColumns.put("acct_server", new Atom<>(rsc.getAcctServer().getHostAddress()));
|
||||
}
|
||||
if (rsc.getSharedSecret() != null) {
|
||||
updateColumns.put("acct_secret", new Atom<>(rsc.getAcctSharedSecret()));
|
||||
updateColumns.put("acct_secret", new Atom<>(rsc.getSharedSecret()));
|
||||
}
|
||||
if (rsc.getAcctPort() != null) {
|
||||
updateColumns.put("acct_port", new Atom<>(rsc.getAcctPort()));
|
||||
}
|
||||
if (rsc.getRadiusProxySecret() != null) {
|
||||
updateColumns.put("proxy_secret", new Atom<>(rsc.getRadiusProxySecret()));
|
||||
}
|
||||
if (databaseSchema.getTables().get(radiusConfigDbTable).getColumns().containsKey("auto_discover")) {
|
||||
if (rsc.getUseRadSec() != null && rsc.getUseRadSec() && rsc.getDynamicDiscovery() != null && rsc.getDynamicDiscovery()) {
|
||||
// if useRadSec && dynamicDiscovery enabled, do not send server information
|
||||
|
||||
@@ -19,7 +19,6 @@ import com.telecominfraproject.wlan.profile.models.common.FileType;
|
||||
import com.telecominfraproject.wlan.profile.models.common.ManagedFileInfo;
|
||||
import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.network.models.RadiusProxyConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
|
||||
import com.telecominfraproject.wlan.profile.radius.models.RadiusServer;
|
||||
import com.telecominfraproject.wlan.profile.rf.models.RfConfiguration;
|
||||
@@ -60,6 +59,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
OvsdbNetworkConfig networkConfig;
|
||||
@Autowired
|
||||
OvsdbNode ovsdbNode;
|
||||
@Autowired
|
||||
OvsdbRadiusProxyConfig radsecConfig;
|
||||
|
||||
protected void getEnabledRadios(OvsdbClient ovsdbClient, List<RadioType> radios) {
|
||||
try {
|
||||
@@ -489,11 +490,6 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
enable80211k = ssidConfig.getRadioBasedConfigs().get(radioType).getEnable80211k();
|
||||
}
|
||||
}
|
||||
|
||||
boolean useRadiusProxy = false;
|
||||
if (ssidConfig.getUseRadiusProxy() != null) {
|
||||
useRadiusProxy = ssidConfig.getUseRadiusProxy();
|
||||
}
|
||||
|
||||
Map<String, String> security = new HashMap<>();
|
||||
String ssidSecurityMode = ssidConfig.getSecureMode().name();
|
||||
@@ -504,7 +500,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
String radiusOperName = null;
|
||||
|
||||
opensyncSecurityMode = getOpensyncSecurityMode(ssidSecurityMode, opensyncSecurityMode);
|
||||
populateSecurityMap(opensyncApConfig, ssidConfig, useRadiusProxy, security, ssidSecurityMode, opensyncSecurityMode);
|
||||
populateSecurityMap(opensyncApConfig, ssidConfig, security, ssidSecurityMode, opensyncSecurityMode);
|
||||
|
||||
int dynamicVlan = 0;
|
||||
if (opensyncSecurityMode.endsWith("EAP")) {
|
||||
@@ -552,16 +548,10 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
interfacesPerFreqBand.put(freqBand, 1);
|
||||
}
|
||||
|
||||
if (useRadiusProxy) {
|
||||
// AP requires proxy secret in security during auto radius proxy
|
||||
for (RadiusProxyConfiguration rsc : ((ApNetworkConfiguration) opensyncApConfig.getApProfile().getDetails()).getRadiusProxyConfigurations()) {
|
||||
if (rsc.getRadiusProxySecret() != null) {
|
||||
security.put("radius_server_secret", rsc.getRadiusProxySecret());
|
||||
security.put("radius_acct_secret", rsc.getRadiusProxySecret());
|
||||
}
|
||||
}
|
||||
boolean useRadiusProxy = false;
|
||||
if (ssidConfig.getUseRadiusProxy() != null) {
|
||||
useRadiusProxy = ssidConfig.getUseRadiusProxy();
|
||||
}
|
||||
|
||||
boolean enableProxyArpForHotspot = false;
|
||||
if (ssidConfig.getEnableProxyArpForHotspot() != null) {
|
||||
enableProxyArpForHotspot = ssidConfig.getEnableProxyArpForHotspot();
|
||||
@@ -574,6 +564,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
|
||||
networkConfig.configureInetVifInterface(ovsdbClient, ifName, enabled, ssidConfig.getForwardMode(), operations);
|
||||
|
||||
if (useRadiusProxy) {
|
||||
// make sure it's enabled if we are going to use it
|
||||
radsecConfig.configureApc(ovsdbClient, useRadiusProxy, operations);
|
||||
}
|
||||
|
||||
} catch (IllegalStateException e) {
|
||||
// could not provision this SSID, but still can go on
|
||||
LOG.warn("could not provision SSID {} on {}", ssidConfig.getSsid(), freqBand);
|
||||
@@ -785,11 +780,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
if (radiusProfileList.size() > 0) {
|
||||
Profile profileRadius = radiusProfileList.get(0);
|
||||
RadiusProfile profileDetails = ((RadiusProfile) profileRadius.getDetails());
|
||||
RadiusServer radiusAcctServerPrimary = profileDetails.getPrimaryRadiusAccountingServer();
|
||||
if (radiusAcctServerPrimary != null) {
|
||||
security.put("radius_acct_ip", radiusAcctServerPrimary.getIpAddress() != null ? radiusAcctServerPrimary.getIpAddress().getHostAddress() : null);
|
||||
security.put("radius_acct_port", radiusAcctServerPrimary.getPort() != null ? String.valueOf(radiusAcctServerPrimary.getPort()) : null);
|
||||
security.put("radius_acct_secret", radiusAcctServerPrimary.getSecret());
|
||||
RadiusServer rServer = profileDetails.getPrimaryRadiusAccountingServer();
|
||||
if (rServer != null) {
|
||||
security.put("radius_acct_ip", rServer.getIpAddress() != null ? rServer.getIpAddress().getHostAddress() : null);
|
||||
security.put("radius_acct_port", rServer.getPort() != null ? String.valueOf(rServer.getPort()) : null);
|
||||
security.put("radius_acct_secret", rServer.getSecret());
|
||||
|
||||
if (ssidConfig.getRadiusAcountingServiceInterval() != null && ssidConfig.getRadiusAcountingServiceInterval() > 0) {
|
||||
// if the value is present, use the
|
||||
@@ -797,23 +792,11 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
security.put("radius_acct_interval", ssidConfig.getRadiusAcountingServiceInterval().toString());
|
||||
|
||||
}
|
||||
LOG.info("Set Primary Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
|
||||
LOG.info("set Radius Accounting server attributes radius_acct_ip {} radius_acct_port {} radius_acct_secret {} radius_acct_interval {}",
|
||||
security.get("radius_acct_ip"), security.get("radius_acct_port"), security.get("radius_acct_secret"),
|
||||
security.get("radius_acct_interval"));
|
||||
} else {
|
||||
LOG.info("No Primary Radius Accounting Server defined in Radius Profile");
|
||||
}
|
||||
|
||||
RadiusServer radiusAcctServerSecondary = profileDetails.getSecondaryRadiusAccountingServer();
|
||||
if (radiusAcctServerSecondary != null) {
|
||||
security.put("radius_acct_ip_secondary", radiusAcctServerSecondary.getIpAddress() != null ? radiusAcctServerSecondary.getIpAddress().getHostAddress() : null);
|
||||
security.put("radius_acct_port_secondary", radiusAcctServerSecondary.getPort() != null ? String.valueOf(radiusAcctServerSecondary.getPort()) : null);
|
||||
security.put("radius_acct_secret_secondary", radiusAcctServerSecondary.getSecret());
|
||||
|
||||
LOG.info("Set Secondary Radius Accounting server attributes radius_acct_ip_secondary {} radius_acct_port_secondary {} radius_acct_secret_secondary {}",
|
||||
security.get("radius_acct_ip_secondary"), security.get("radius_acct_port_secondary"), security.get("radius_acct_secret_secondary"));
|
||||
} else {
|
||||
LOG.info("No Secondary Radius Accounting Server defined in Radius Profile");
|
||||
LOG.info("No Radius Accounting Server defined in Radius Profile");
|
||||
}
|
||||
|
||||
} else {
|
||||
@@ -838,19 +821,8 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
security.put("radius_server_ip", radiusServer.getIpAddress() != null ? radiusServer.getIpAddress().getHostAddress() : null);
|
||||
security.put("radius_server_port", radiusServer.getPort() != null ? String.valueOf(radiusServer.getPort()) : null);
|
||||
security.put("radius_server_secret", radiusServer.getSecret());
|
||||
LOG.info("Set Primary Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
|
||||
LOG.info("set Radius server attributes radius_server_ip {} radius_server_port {} radius_server_secret {}", security.get("radius_server_ip"),
|
||||
security.get("radius_server_port"), security.get("radius_server_secret"));
|
||||
|
||||
RadiusServer radiusServerSecondary = profileDetails.getSecondaryRadiusAuthServer();
|
||||
if (radiusServerSecondary != null) {
|
||||
security.put("radius_server_ip_secondary", radiusServerSecondary.getIpAddress() != null ? radiusServerSecondary.getIpAddress().getHostAddress() : null);
|
||||
security.put("radius_server_port_secondary", radiusServerSecondary.getPort() != null ? String.valueOf(radiusServerSecondary.getPort()) : null);
|
||||
security.put("radius_server_secret_secondary", radiusServerSecondary.getSecret());
|
||||
LOG.info("Set Secondary Radius server attributes radius_server_ip_secondary {} radius_server_port_secondary {} radius_server_secret_secondary {}",
|
||||
security.get("radius_server_ip_secondary"), security.get("radius_server_port_secondary"), security.get("radius_server_secret_secondary"));
|
||||
} else {
|
||||
LOG.info("No Secondary Radius Authentication Server defined in Radius Profile");
|
||||
}
|
||||
} else {
|
||||
LOG.warn("Could not find radius profile {} in {}", ssidConfig.getRadiusServiceId(), opensyncApConfig.getRadiusProfiles());
|
||||
}
|
||||
@@ -866,7 +838,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
* @param ssidSecurityMode
|
||||
* @param opensyncSecurityMode
|
||||
*/
|
||||
void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Boolean useRadiusProxy, Map<String, String> security, String ssidSecurityMode,
|
||||
void populateSecurityMap(OpensyncAPConfig opensyncApConfig, SsidConfiguration ssidConfig, Map<String, String> security, String ssidSecurityMode,
|
||||
String opensyncSecurityMode) {
|
||||
security.put("encryption", opensyncSecurityMode);
|
||||
// key and mode is N/A for OPEN security
|
||||
@@ -893,21 +865,21 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
case "wpa2OnlyEAP":
|
||||
case "wpa2OnlyRadius":
|
||||
security.put("mode", "2");
|
||||
if (!useRadiusProxy) {
|
||||
if (!ssidConfig.getUseRadiusProxy()) {
|
||||
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
}
|
||||
break;
|
||||
case "wpa3OnlyEAP":
|
||||
security.put("mode", "3");
|
||||
if (!useRadiusProxy) {
|
||||
if (!ssidConfig.getUseRadiusProxy()) {
|
||||
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
}
|
||||
break;
|
||||
case "wpa3OnlyEAP192":
|
||||
security.put("mode", "3");
|
||||
if (!useRadiusProxy) {
|
||||
if (!ssidConfig.getUseRadiusProxy()) {
|
||||
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
}
|
||||
@@ -916,7 +888,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
case "wpa2Radius":
|
||||
case "wpa3MixedEAP":
|
||||
security.put("mode", "mixed");
|
||||
if (!useRadiusProxy) {
|
||||
if (!ssidConfig.getUseRadiusProxy()) {
|
||||
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
}
|
||||
@@ -924,7 +896,7 @@ public class OvsdbSsidConfig extends OvsdbDaoBase {
|
||||
case "wpaEAP":
|
||||
case "wpaRadius":
|
||||
security.put("mode", "1");
|
||||
if (!useRadiusProxy) {
|
||||
if (!ssidConfig.getUseRadiusProxy()) {
|
||||
getRadiusConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
getRadiusAccountingConfiguration(opensyncApConfig, ssidConfig, security);
|
||||
}
|
||||
|
||||
@@ -351,8 +351,8 @@ public class OvsdbStatsConfig extends OvsdbDaoBase {
|
||||
rowColumns.put("report_type", new Atom<>("raw"));
|
||||
rowColumns.put("stats_type", new Atom<>("survey"));
|
||||
rowColumns.put("survey_type", new Atom<>("off-chan"));
|
||||
rowColumns.put("sampling_interval", new Atom<>(10));
|
||||
rowColumns.put("survey_interval_ms", new Atom<>(120));
|
||||
rowColumns.put("sampling_interval", new Atom<>(0));
|
||||
rowColumns.put("survey_interval_ms", new Atom<>(10));
|
||||
rowColumns.put("threshold", thresholds);
|
||||
Row updateRow = new Row(rowColumns);
|
||||
operations.add(new Insert(wifiStatsConfigDbTable, updateRow));
|
||||
|
||||
@@ -13,7 +13,6 @@ public class OvsdbStringConstants {
|
||||
public static final String FW_IMAGE_NAME_KEY = "FW_IMAGE_NAME";
|
||||
public static final String FW_IMAGE_ACTIVE_KEY = "FW_IMAGE_ACTIVE";
|
||||
public static final String FW_IMAGE_INACTIVE_KEY = "FW_IMAGE_INACTIVE";
|
||||
public static final String FW_IMAGE_DATE = "DATE";
|
||||
|
||||
// AWLAN_Node values which can be placed in firmware_url column to trigger
|
||||
// behavior other than firmware download/flash
|
||||
|
||||
@@ -123,6 +123,7 @@ public class OpensyncGatewayTipWlanOvsdbClientTest {
|
||||
Mockito.when(ovsdbSessionMapInterface.getSession("Test_Client_21P10C68818122")).thenReturn(ovsdbSession);
|
||||
|
||||
OpensyncAPConfig apConfig = Mockito.mock(OpensyncAPConfig.class, Mockito.RETURNS_DEEP_STUBS);
|
||||
|
||||
Mockito.when(apConfig.getApProfile().getDetails()).thenReturn(Mockito.mock(ApNetworkConfiguration.class));
|
||||
|
||||
Mockito.when(opensyncExternalIntegrationInterface.getApConfig(Mockito.anyString())).thenReturn(apConfig);
|
||||
|
||||
@@ -34,9 +34,11 @@ import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.telecominfraproject.wlan.core.model.equipment.RadioType;
|
||||
import com.telecominfraproject.wlan.location.models.Location;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPHotspot20Config;
|
||||
import com.telecominfraproject.wlan.profile.models.Profile;
|
||||
@@ -44,12 +46,11 @@ import com.telecominfraproject.wlan.profile.models.ProfileType;
|
||||
import com.telecominfraproject.wlan.profile.network.models.ApNetworkConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.network.models.GreTunnelConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceLocal;
|
||||
import com.telecominfraproject.wlan.status.controller.StatusController;
|
||||
import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
|
||||
import com.vmware.ovsdb.exception.OvsdbClientException;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Atom;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Row;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Uuid;
|
||||
import com.vmware.ovsdb.protocol.operation.notation.Value;
|
||||
import com.vmware.ovsdb.protocol.operation.result.ErrorResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.InsertResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.OperationResult;
|
||||
@@ -67,8 +68,8 @@ import com.vmware.ovsdb.service.OvsdbClient;
|
||||
@Import(
|
||||
value = {OvsdbDao.class, OvsdbDaoTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class, OvsdbHotspotConfig.class, OvsdbCommandConfig.class,
|
||||
OvsdbMonitor.class, OvsdbFirmwareConfig.class, OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
|
||||
OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class, StatusServiceLocal.class, StatusController.class,
|
||||
CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
|
||||
OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class
|
||||
|
||||
})
|
||||
public class OvsdbDaoTest {
|
||||
|
||||
|
||||
@@ -104,7 +104,7 @@ public class OvsdbDaoTestUtilities {
|
||||
((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpen.getId());
|
||||
profileSsidPsk.getChildProfileIds().add(passpointHotspotConfig.getId());
|
||||
((PasspointProfile) passpointHotspotConfig.getDetails())
|
||||
.setAssociatedAccessSsidProfileIds(Set.of(profileSsidPsk.getId()));
|
||||
.setAssociatedAccessSsidProfileIds(List.of(profileSsidPsk.getId()));
|
||||
return passpointHotspotConfig;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,245 +0,0 @@
|
||||
package com.telecominfraproject.wlan.opensync.ovsdb.dao;
|
||||
|
||||
import com.telecominfraproject.wlan.equipment.models.Equipment;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.telecominfraproject.wlan.profile.ethernetport.models.WiredEthernetPortConfiguration;
|
||||
import com.telecominfraproject.wlan.profile.ethernetport.models.WiredPort;
|
||||
import com.telecominfraproject.wlan.profile.models.Profile;
|
||||
import com.telecominfraproject.wlan.profile.models.ProfileType;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceInterface;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredEthernetPortStatusData;
|
||||
import com.telecominfraproject.wlan.status.equipment.report.models.WiredPortStatus;
|
||||
import com.telecominfraproject.wlan.status.models.Status;
|
||||
import com.telecominfraproject.wlan.status.models.StatusDataType;
|
||||
import com.vmware.ovsdb.exception.OvsdbClientException;
|
||||
import com.vmware.ovsdb.protocol.operation.result.OperationResult;
|
||||
import com.vmware.ovsdb.protocol.operation.result.UpdateResult;
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.MockitoSession;
|
||||
import org.mockito.quality.Strictness;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.boot.test.mock.mockito.MockBean;
|
||||
import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import static org.mockito.Mockito.times;
|
||||
|
||||
/**
|
||||
* @author rsharma
|
||||
*/
|
||||
|
||||
@RunWith(SpringRunner.class)
|
||||
@ActiveProfiles(profiles = { "integration_test", })
|
||||
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = OvsdbNetworkConfigTest.class)
|
||||
@Import(value = { OvsdbNetworkConfig.class
|
||||
|
||||
})
|
||||
public class OvsdbNetworkConfigTest {
|
||||
|
||||
@Mock(answer = Answers.RETURNS_MOCKS)
|
||||
OvsdbClient ovsdbClient;
|
||||
|
||||
@Autowired
|
||||
OvsdbNetworkConfig ovsdbNetworkConfig;
|
||||
|
||||
@MockBean(answer = Answers.RETURNS_MOCKS)
|
||||
StatusServiceInterface statusServiceInterface;
|
||||
|
||||
@MockBean(answer = Answers.RETURNS_MOCKS)
|
||||
OvsdbGet ovsdbGet;
|
||||
|
||||
@Mock(answer = Answers.RETURNS_MOCKS)
|
||||
CompletableFuture<OperationResult[]> futureResult;
|
||||
|
||||
private MockitoSession mockito;
|
||||
|
||||
private static final String LAN_IF_NAME = "lan";
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
mockito = Mockito.mockitoSession().initMocks(this).strictness(Strictness.WARN).startMocking();
|
||||
Mockito.when(ovsdbClient.transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList())).thenReturn(futureResult);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
mockito.finishMocking();
|
||||
}
|
||||
|
||||
// Eth0 port is in LAN mode and we need it to convert to eth0_trunk
|
||||
@Test
|
||||
public void testConfigureEthernetPorts_BridgeTrunkMode() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
|
||||
OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
|
||||
Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
|
||||
.thenReturn(updateResult);
|
||||
|
||||
ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(true, "bridge"));
|
||||
|
||||
Mockito.verify(ovsdbClient, times(2)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
|
||||
}
|
||||
|
||||
// Other tests that are useful to consider -- NOT anymore with GW deleting existing interfaces
|
||||
// Case when ETH port is in eth0_trunk mode and no changes are required
|
||||
// Case when ETH port is already in eth0_vlan100 and no changes are required
|
||||
|
||||
// Case when ETH port is in LAN mode and we convert it into BRIDGE + VlanId
|
||||
@Test
|
||||
public void testConfigureEthernetPorts_BridgeAccessMode() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
|
||||
OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
|
||||
Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
|
||||
.thenReturn(updateResult);
|
||||
|
||||
ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(false, "bridge"));
|
||||
|
||||
Mockito.verify(ovsdbClient, times(2)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
|
||||
}
|
||||
|
||||
// Case when ETH port is in BRIDGE + VlanId and we convert it into NAT (LAN)
|
||||
@Test
|
||||
public void testConfigureEthernetPorts_BridgeAccessToNATConversion() throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
|
||||
OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
|
||||
Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS))
|
||||
.thenReturn(updateResult);
|
||||
|
||||
ovsdbNetworkConfig.configureEthernetPorts(ovsdbClient, createOpensyncApConfig(false, "NAT"));
|
||||
|
||||
Mockito.verify(ovsdbClient, times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
|
||||
}
|
||||
|
||||
// Case when ETH port is in BRIDGE + Trunk and Profile is removed so we convert
|
||||
// it in NAT (LAN)
|
||||
@Test
|
||||
public void testResetWiredPorts_BridgeTrunkToNAT()
|
||||
throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
|
||||
// at the beginning LAN's currentIfName is wan
|
||||
Mockito.when(statusServiceInterface.getOrNull(Mockito.anyInt(), Mockito.anyLong(),
|
||||
Mockito.any(StatusDataType.class))).thenReturn(createWiredEthernetPortStatus("wan"));
|
||||
OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
|
||||
Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS)).thenReturn(updateResult);
|
||||
|
||||
ovsdbNetworkConfig.resetWiredPorts(ovsdbClient, createOpensyncApConfig(true, "bridge"));
|
||||
// transact() execute 1 time as we move LAN from wan interface back to lan
|
||||
// interface
|
||||
// (vlan interface will be removed in inetC table directly)
|
||||
Mockito.verify(ovsdbClient, times(1)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
|
||||
}
|
||||
|
||||
// Case when ETH port is in NAT + Access and Profile is removed we don't do
|
||||
// anything
|
||||
@Test
|
||||
public void testResetWiredPorts_NATToNAT()
|
||||
throws ExecutionException, InterruptedException, TimeoutException, OvsdbClientException {
|
||||
// at the beginning LAN's currentIfName is wan
|
||||
Mockito.when(statusServiceInterface.getOrNull(Mockito.anyInt(), Mockito.anyLong(),
|
||||
Mockito.any(StatusDataType.class))).thenReturn(createWiredEthernetPortStatus("lan"));
|
||||
OperationResult[] updateResult = new OperationResult[] { new UpdateResult(1) };
|
||||
Mockito.when(futureResult.get(ovsdbNetworkConfig.ovsdbTimeoutSec, TimeUnit.SECONDS)).thenReturn(updateResult);
|
||||
|
||||
ovsdbNetworkConfig.resetWiredPorts(ovsdbClient, createOpensyncApConfig(false, "NAT"));
|
||||
// Note: Strictness set to WARN in setup() rather than STRICT_STUB as we are
|
||||
// adding unnecessary stubbings above to test if any transact() is called.
|
||||
Mockito.verify(ovsdbClient, times(0)).transact(Mockito.eq(OvsdbDao.ovsdbName), Mockito.anyList());
|
||||
}
|
||||
|
||||
private OpensyncAPConfig createOpensyncApConfig(boolean isTrunkEnabled, String ifType) {
|
||||
OpensyncAPConfig opensyncApConfig = new OpensyncAPConfig();
|
||||
|
||||
Equipment customerEquip = new Equipment();
|
||||
customerEquip.setCustomerId(1);
|
||||
customerEquip.setId(1L);
|
||||
opensyncApConfig.setCustomerEquipment(customerEquip);
|
||||
opensyncApConfig.setWiredEthernetPortProfile(createWiredEthernetPortProfile(isTrunkEnabled, ifType));
|
||||
|
||||
return opensyncApConfig;
|
||||
}
|
||||
|
||||
private Profile createWiredEthernetPortProfile(boolean isTrunkEnabled, String ifType) {
|
||||
WiredPort portLan = createWiredPort("lan", ifType, isTrunkEnabled, 10, List.of(100, 200), "eth0", "ETHERNET");
|
||||
WiredPort portWan = createWiredPort("wan", "bridge", false, 0, null, "eth1", "INTERNET");
|
||||
|
||||
WiredEthernetPortConfiguration details = new WiredEthernetPortConfiguration();
|
||||
details.setEquipmentModel("EA8300");
|
||||
details.setEthPorts(Set.of(portLan, portWan));
|
||||
|
||||
Profile wiredEthernetPortProfile = new Profile();
|
||||
wiredEthernetPortProfile.setCustomerId(1);
|
||||
wiredEthernetPortProfile.setProfileType(ProfileType.wired_ethernet_port);
|
||||
wiredEthernetPortProfile.setId(10L);
|
||||
wiredEthernetPortProfile.setName("WiredProfileForTest");
|
||||
wiredEthernetPortProfile.setCreatedTimestamp(1634060798000L);
|
||||
wiredEthernetPortProfile.setLastModifiedTimestamp(1634060798000L);
|
||||
wiredEthernetPortProfile.setDetails(details);
|
||||
|
||||
return wiredEthernetPortProfile;
|
||||
}
|
||||
|
||||
private WiredPort createWiredPort(String ifName, String ifType, boolean isTrunkEnabled, int vlanId, List<Integer> allowedVlans,
|
||||
String name, String displayName) {
|
||||
WiredPort wiredPort = new WiredPort();
|
||||
wiredPort.setIfName(ifName);
|
||||
wiredPort.setIfType(ifType);
|
||||
wiredPort.setTrunkEnabled(isTrunkEnabled);
|
||||
wiredPort.setVlanId(vlanId);
|
||||
wiredPort.setAllowedVlanIds(allowedVlans);
|
||||
wiredPort.setName(name);
|
||||
wiredPort.setDisplayName(displayName);
|
||||
|
||||
return wiredPort;
|
||||
}
|
||||
|
||||
private Status createWiredEthernetPortStatus(String lanPortIfName) {
|
||||
WiredEthernetPortStatusData statusDetails = new WiredEthernetPortStatusData();
|
||||
if (lanPortIfName.equals(LAN_IF_NAME)) {
|
||||
WiredPortStatus wiredPortStatusLan = createWiredPortStatus(lanPortIfName, "NAT", false, 0, null, "eth0", "lan", "up");
|
||||
WiredPortStatus wiredPortStatusWan = createWiredPortStatus("wan", "bridge", true, 0, null, "eth1", "wan", "up");
|
||||
statusDetails.setInterfacePortStatusMap(Map.of("lan", List.of(wiredPortStatusLan), "wan", List.of(wiredPortStatusWan)));
|
||||
} else {
|
||||
WiredPortStatus wiredPortStatusLan = createWiredPortStatus(lanPortIfName, "bridge", true, 10, List.of(100,200), "eth0", "lan", "up");
|
||||
WiredPortStatus wiredPortStatusWan = createWiredPortStatus("wan", "bridge", true, 0, null, "eth1", "wan", "up");
|
||||
statusDetails.setInterfacePortStatusMap(Map.of("lan", List.of(), "wan", List.of(wiredPortStatusLan, wiredPortStatusWan)));
|
||||
}
|
||||
|
||||
|
||||
Status status = new Status();
|
||||
status.setCustomerId(1);
|
||||
status.setEquipmentId(1L);
|
||||
status.setStatusDataType(StatusDataType.WIRED_ETHERNET_PORT);
|
||||
status.setDetails(statusDetails);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
private WiredPortStatus createWiredPortStatus(String ifName, String ifType, boolean isTrunkEnabled, int vlanId,
|
||||
List<Integer> allowedVlans, String name, String originalIfName, String operationalState) {
|
||||
WiredPortStatus status = new WiredPortStatus();
|
||||
status.setIfType(ifType);
|
||||
status.setCurrentIfName(ifName);
|
||||
status.setOriginalIfName(originalIfName);
|
||||
status.setName(name);
|
||||
status.setAllowedVlanIds(allowedVlans);
|
||||
status.setDuplex("full");
|
||||
status.setSpeed(1000);
|
||||
status.setTrunkEnabled(isTrunkEnabled);
|
||||
status.setOperationalState(operationalState);
|
||||
status.setVlanId(vlanId);
|
||||
|
||||
return status;
|
||||
}
|
||||
}
|
||||
@@ -23,12 +23,8 @@ import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.ConnectNodeInfo;
|
||||
import com.telecominfraproject.wlan.opensync.util.OvsdbToWlanCloudTypeMappingUtility;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceLocal;
|
||||
import com.telecominfraproject.wlan.status.controller.StatusController;
|
||||
import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
|
||||
import com.vmware.ovsdb.protocol.operation.result.OperationResult;
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
|
||||
@@ -40,8 +36,8 @@ import com.vmware.ovsdb.service.OvsdbClient;
|
||||
@Import(value = { OvsdbDao.class, OvsdbNodeTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
|
||||
OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
|
||||
OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
|
||||
OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class, StatusServiceLocal.class, StatusController.class,
|
||||
CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
|
||||
OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
|
||||
|
||||
})
|
||||
public class OvsdbNodeTest {
|
||||
|
||||
|
||||
@@ -24,16 +24,12 @@ import org.springframework.context.annotation.Import;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import com.telecominfraproject.wlan.cloudeventdispatcher.CloudEventDispatcherEmpty;
|
||||
import com.telecominfraproject.wlan.location.models.Location;
|
||||
import com.telecominfraproject.wlan.opensync.external.integration.models.OpensyncAPConfig;
|
||||
import com.telecominfraproject.wlan.profile.models.Profile;
|
||||
import com.telecominfraproject.wlan.profile.models.ProfileType;
|
||||
import com.telecominfraproject.wlan.profile.radius.models.RadiusProfile;
|
||||
import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
|
||||
import com.telecominfraproject.wlan.status.StatusServiceLocal;
|
||||
import com.telecominfraproject.wlan.status.controller.StatusController;
|
||||
import com.telecominfraproject.wlan.status.datastore.inmemory.StatusDatastoreInMemory;
|
||||
import com.vmware.ovsdb.protocol.operation.result.OperationResult;
|
||||
import com.vmware.ovsdb.service.OvsdbClient;
|
||||
|
||||
@@ -45,8 +41,8 @@ import com.vmware.ovsdb.service.OvsdbClient;
|
||||
@Import(value = { OvsdbDao.class, OvsdbSsidConfigTest.Config.class, OvsdbNode.class, OvsdbRadioConfig.class,
|
||||
OvsdbHotspotConfig.class, OvsdbCommandConfig.class, OvsdbMonitor.class, OvsdbFirmwareConfig.class,
|
||||
OvsdbStatsConfig.class, OvsdbSsidConfig.class, OvsdbRrmConfig.class, OvsdbNetworkConfig.class,
|
||||
OvsdbNodeConfig.class, OvsdbRadiusProxyConfig.class, StatusServiceLocal.class, StatusController.class,
|
||||
CloudEventDispatcherEmpty.class, StatusDatastoreInMemory.class
|
||||
OvsdbNodeConfig.class,OvsdbRadiusProxyConfig.class
|
||||
|
||||
})
|
||||
public class OvsdbSsidConfigTest {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user