Telecominfraproject/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2026-03-20 19:39:11 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

TW-19 - adjusted code to match models defined in rel-v8.0.x

Browse Source
This commit is contained in:
DTop
2020-02-10 17:16:38 -05:00
parent b39b787f9b
commit 000b8a97d4
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opensync_ext_kdc/src/main/java/ai/connectus/opensync/external/integration/OpensyncExternalIntegrationKDC.java vendored
View File

@@ -127,7 +127,7 @@ public class OpensyncExternalIntegrationKDC implements OpensyncExternalIntegrati
ce = kdcEquipmentRecordCache.get(apId, new Callable<CustomerEquipment>() {
@Override
public CustomerEquipment call() throws Exception {
return eqNetworkManagementInterface.getCustomerEquipmentByQrCodeOrNull(apId);
return eqNetworkManagementInterface.getCustomerEquipmentByQrCode(apId);
}
});
}catch (Exception e) {
@@ -579,7 +579,7 @@ public class OpensyncExternalIntegrationKDC implements OpensyncExternalIntegrati
}
if(cl.getStats().hasRxRate()) {
cMetrics.setAverageRxRate(cl.getStats().getRxRate());
//cMetrics.setAverageRxRate(cl.getStats().getRxRate());
}
if(cl.getStats().hasRxErrors()) {
@@ -587,7 +587,8 @@ public class OpensyncExternalIntegrationKDC implements OpensyncExternalIntegrati
}
if(cl.getStats().hasRxFrames()) {
cMetrics.setNumRxFramesReceived(cl.getStats().getRxFrames());
//cMetrics.setNumRxFramesReceived(cl.getStats().getRxFrames());
cMetrics.setNumRxPackets(cl.getStats().getRxFrames());
}
if(cl.getStats().hasRxRetries()) {
@@ -600,7 +601,11 @@ public class OpensyncExternalIntegrationKDC implements OpensyncExternalIntegrati
}
if(cl.getStats().hasTxRate()) {
cMetrics.setAverageTxRate(cl.getStats().getTxRate());
//cMetrics.setAverageTxRate(cl.getStats().getTxRate());
}
if(cl.getStats().hasTxRate() && cl.getStats().hasRxRate()) {
cMetrics.setRates(new byte[]{(byte) (cl.getStats().getTxRate()), (byte) (cl.getStats().getRxRate())});
}
if(cl.getStats().hasTxErrors()) {
@@ -608,7 +613,8 @@ public class OpensyncExternalIntegrationKDC implements OpensyncExternalIntegrati
}
if(cl.getStats().hasTxFrames()) {
cMetrics.setNumTxFramesTransmitted(cl.getStats().getTxFrames());
//cMetrics.setNumTxFramesTransmitted(cl.getStats().getTxFrames());
cMetrics.setNumTxPackets(cl.getStats().getRxFrames());
}
if(cl.getStats().hasTxRetries()) {

4
opensync_ext_kdc/src/main/java/ai/connectus/opensync/external/integration/controller/OpensyncKDCGatewayController.java vendored
View File

@@ -224,7 +224,6 @@ public class OpensyncKDCGatewayController {
//TODO: implement sending command via ovsdb session.
response.setQueued(true);
return response;
}
@@ -266,7 +265,8 @@ public class OpensyncKDCGatewayController {
throw new ConfigurationException(
"Unabled to register gateway with routing service: routing service interface not initialized");
}
CustomerEquipmentGwRecord gwRecord = new CustomerEquipmentGwRecord(CloudServiceType.CEGW, getDeploymentId());
CustomerEquipmentGwRecord gwRecord = new CustomerEquipmentGwRecord();
gwRecord.setDeploymentId(getDeploymentId());
// Internal facing service
gwRecord.setGatewayId(getGatewayName());