diff options
author | 2022-09-26 16:57:12 +0800 | |
---|---|---|
committer | 2022-09-27 10:10:53 +0800 | |
commit | af58baecadb732685e29e5c1b8172d90fec1458d (patch) | |
tree | ce7700e93d34a4e8326be89e6407f77b622fd2f7 /components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn | |
parent | f5db5bd223d369a1186c94f43ab642e9c4d69709 (diff) |
[SLICEMS]Fix bug that config thread hang up when cbs policy is empty
Fix bug for config thread
Issue-ID: DCAEGEN2-3273
Signed-off-by: qingshuting <qingshuting1@huawei.com>
Change-Id: I3de62d62b5dc91ada70060c0820b0b4b701df728
Diffstat (limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn')
2 files changed, 13 insertions, 13 deletions
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/BandwidthEvaluator.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/BandwidthEvaluator.java index 7ca100d1..67cda89a 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/BandwidthEvaluator.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/BandwidthEvaluator.java @@ -109,16 +109,17 @@ public class BandwidthEvaluator { String serviceId = (String) event.subject(); Map<String, Integer> maxBandwidthData = aaiService.fetchMaxBandwidthOfService(serviceId); if (maxBandwidthData.get("maxBandwidth") != null){ - log.info("Successfully retrieved bandwidth info from AAI; service: {}, bandwidth: {}", + log.debug("Successfully retrieved bandwidth info from AAI; service: {}, bandwidth: {}", serviceId, maxBandwidthData.get("maxBandwidth")); int bwValue = maxBandwidthData.get("maxBandwidth").intValue(); if (ccvpnPmDatastore.getProvBwOfSvc(serviceId) == 0){ ccvpnPmDatastore.updateProvBw(serviceId, bwValue, true); + log.debug("Provision bw of cll {} updated from 0 to {}, max bw is {}", serviceId, ccvpnPmDatastore.getProvBwOfSvc(serviceId), bwValue); } else if (ccvpnPmDatastore.getProvBwOfSvc(serviceId) != bwValue) { - log.info("Service modification complete; serviceId: {} with new bandwidth: {}", serviceId, bwValue); + log.debug("Service modification complete; serviceId: {} update prov bw from {} to {}", serviceId, ccvpnPmDatastore.getProvBwOfSvc(serviceId), bwValue); ccvpnPmDatastore.updateProvBw(serviceId, bwValue, true); ccvpnPmDatastore.updateSvcState(serviceId, ServiceState.RUNNING); - log.debug("Service state of {} is changed to running", serviceId); + log.debug("Service state of {} is changed to running, {}", serviceId, ccvpnPmDatastore.getStatusOfSvc(serviceId)); } } log.debug("=== Processing AAI network policy query complete ==="); diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/CCVPNPmDatastore.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/CCVPNPmDatastore.java index 5f3ce311..3e6c4746 100644 --- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/CCVPNPmDatastore.java +++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/CCVPNPmDatastore.java @@ -25,7 +25,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; import lombok.Getter; -import lombok.Setter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -200,15 +199,6 @@ public class CCVPNPmDatastore { public void updateCllInstances(Set<String> allValidCllInstances){ Set<String> invalidCllIds; invalidCllIds= filterInvalidCllIds(allValidCllInstances, svcStatus.keySet()); - svcStatus.keySet().removeAll(invalidCllIds); - invalidCllIds = filterInvalidCllIds(allValidCllInstances, endpointToProvBw.keySet()); - endpointToProvBw.keySet().removeAll(invalidCllIds); - invalidCllIds = filterInvalidCllIds(allValidCllInstances, upperBoundBw.keySet()); - upperBoundBw.keySet().removeAll(invalidCllIds); - invalidCllIds = filterInvalidCllIds(allValidCllInstances, endpointToOriginalBw.keySet()); - endpointToOriginalBw.keySet().removeAll(invalidCllIds); - invalidCllIds = filterInvalidCllIds(allValidCllInstances, closedLoopBwAssuranceStatus.keySet()); - closedLoopBwAssuranceStatus.keySet().removeAll(invalidCllIds); for(String invalidCllId : invalidCllIds) { log.debug("drop {} from endpointToUsedBw", invalidCllId); endpointToUsedBw.entrySet().stream().dropWhile(map -> map.getKey().getCllId().equalsIgnoreCase(invalidCllId)); @@ -220,6 +210,15 @@ public class CCVPNPmDatastore { } } } + svcStatus.keySet().removeAll(invalidCllIds); + invalidCllIds = filterInvalidCllIds(allValidCllInstances, endpointToProvBw.keySet()); + endpointToProvBw.keySet().removeAll(invalidCllIds); + invalidCllIds = filterInvalidCllIds(allValidCllInstances, upperBoundBw.keySet()); + upperBoundBw.keySet().removeAll(invalidCllIds); + invalidCllIds = filterInvalidCllIds(allValidCllInstances, endpointToOriginalBw.keySet()); + endpointToOriginalBw.keySet().removeAll(invalidCllIds); + invalidCllIds = filterInvalidCllIds(allValidCllInstances, closedLoopBwAssuranceStatus.keySet()); + closedLoopBwAssuranceStatus.keySet().removeAll(invalidCllIds); } /** |