diff options
author | qingshuting <qingshuting1@huawei.com> | 2022-09-26 16:57:12 +0800 |
---|---|---|
committer | qingshuting <qingshuting1@huawei.com> | 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/CCVPNPmDatastore.java | |
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/CCVPNPmDatastore.java')
-rw-r--r-- | components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/ccvpn/CCVPNPmDatastore.java | 19 |
1 files changed, 9 insertions, 10 deletions
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); } /** |