From b425177693b1fd0063a3bb499c7d6183da9434aa Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Mon, 28 May 2018 11:24:13 +0200 Subject: Use the ETSI config from package Change-Id: I81c7a10c1c7e0f3e12531bc5a1196b22d0fcd774 Signed-off-by: Denes Nemeth Issue-ID: VFC-728 --- .../vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java') diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java index c2ba4642..cf090630 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/VfcGrantManager.java @@ -166,12 +166,14 @@ public class VfcGrantManager implements IGrantManager { } private Set calculateResourceChangeDuringInstantiate(String cbamVnfdContent, String instantiationLevelId) { + logger.info("Calculating resource changed {} {}", instantiationLevelId, cbamVnfdContent); JsonObject root = new Gson().toJsonTree(new Yaml().load(cbamVnfdContent)).getAsJsonObject(); JsonObject capabilities = child(child(child(root, "topology_template"), "substitution_mappings"), "capabilities"); JsonObject deploymentFlavorProperties = child(child(capabilities, "deployment_flavour"), "properties"); JsonObject instantiationLevels = child(deploymentFlavorProperties, "instantiation_levels"); Set resourceChanges = new HashSet<>(); - for (Map.Entry vdu_level : child(child(instantiationLevels, instantiationLevelId), ("vdu_levels")).entrySet()) { + JsonObject instantiationLevel = child(instantiationLevels, instantiationLevelId); + for (Map.Entry vdu_level : child(instantiationLevel, "vdu_levels").entrySet()) { JsonElement numberOfInstances = vdu_level.getValue().getAsJsonObject().get("number_of_instances"); for (int i = 0; i < numberOfInstances.getAsLong(); i++) { ResourceChange resourceChange = new ResourceChange(); -- cgit 1.2.3-korg