From: Lukasz Rajewski <lukasz.rajewski@orange.com>
Date: Fri, 23 Jul 2021 09:32:30 +0000 (+0200)
Subject: Change rb-definition-version identifier
X-Git-Tag: 1.7.0^0
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=169c89e0c403dad3e3e538ae92b46f12971aa20a

Change rb-definition-version identifier

rb-definition-version identifier was changed
to vf-omdule-model-customization-uuid to enable
vf-module model update scenarios

Issue-ID: MULTICLOUD-1377
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
Change-Id: I98908d7f9215c23b9b55710c64b993a6c9f62623
---

diff --git a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java
index 5f93e28..b63fea0 100644
--- a/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java
+++ b/artifactbroker/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/k8s/K8sArtifactForwarder.java
@@ -113,10 +113,11 @@ public class K8sArtifactForwarder implements ArtifactForwarder {
 
             Map<String, Object> map = new LinkedHashMap<String, Object>();
             map.put("rb-name", vfModule.getVfModuleModelInvariantUUID());
-            map.put("rb-version", vfModule.getVfModuleModelUUID());
+            map.put("rb-version", vfModule.getVfModuleModelCustomizationUUID());
             map.put("descritpion",vfModule.getVfModuleModelDescription());
             Map<String, String> labelMap = new LinkedHashMap<String, String>();
-            labelMap.put("vnf_customization_uuid",vfModule.getVfModuleModelCustomizationUUID());
+            labelMap.put("vf_module_model_uuid",vfModule.getVfModuleModelUUID());
+            labelMap.put("vf_module_model_name",vfModule.getVfModuleModelName());
             map.put("labels", labelMap);
             String json = gson.toJson(map);
 
@@ -132,7 +133,7 @@ public class K8sArtifactForwarder implements ArtifactForwarder {
 
     private boolean uploadArtifact(VfModuleModel vfModule) {
         String url = BASE_PATH + "/" + vfModule.getVfModuleModelInvariantUUID() + "/"
-            + vfModule.getVfModuleModelUUID() + "/content";
+            + vfModule.getVfModuleModelCustomizationUUID() + "/content";
         HttpPost httpPost = new HttpPost(url);
         httpPost.addHeader("content-type", "application/x-www-form-urlencoded;charset=utf-8");