Save k8s definition using vfmodule model ids

Use the vfmodule model invariant id as the resource bundle
definition name and the vfmodule model version as the resource
bundle definition version when saving the resource bundle.

Change-Id: Iaa3fcbf72f40ea1d4df5c46f7bb6d0c797a9e7e1
Issue-ID: MULTICLOUD-836
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

2 files changed, 10 insertions, 2 deletions

diff --git a/artifactbroker/model/src/main/java/org/onap/policy/distribution/model/VfModuleModel.java b/artifactbroker/model/src/main/java/org/onap/policy/distribution/model/VfModuleModel.java
index 220dc57..1f0762c 100644
--- a/artifactbroker/model/src/main/java/org/onap/policy/distribution/model/VfModuleModel.java
+++ b/artifactbroker/model/src/main/java/org/onap/policy/distribution/model/VfModuleModel.java
@@ -50,6 +50,14 @@ public class VfModuleModel {
         return vfModuleModelVersion;
     }
 
+    public String getVfModuleModelInvariantUUID() {
+        return vfModuleModelInvariantUUID;
+    }
+
+    public String getVfModuleModelUUID() {
+        return vfModuleModelUUID;
+    }
+
     public String getVfModuleModelCustomizationUUID() {
         return vfModuleModelCustomizationUUID;
     }
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 894f0c1..52c0617 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
@@ -111,8 +111,8 @@ public class K8sArtifactForwarder implements ArtifactForwarder {
                 .create();
 
             Map<String, Object> map = new LinkedHashMap<String, Object>();
-            map.put("rb-name", vfModule.getVfModuleModelName());
-            map.put("rb-version", vfModule.getVfModuleModelVersion());
+            map.put("rb-name", vfModule.getVfModuleModelInvariantUUID());
+            map.put("rb-version", vfModule.getVfModuleModelUUID());
             map.put("descritpion",vfModule.getVfModuleModelDescription());
             Map<String, String> labelMap = new LinkedHashMap<String, String>();
             labelMap.put("vnf_customization_uuid",vfModule.getVfModuleModelCustomizationUUID());