Fix changed instance attribute value not visible in generated tosca

also fixes attributes not being exported/imported with a schema

Issue-ID: SDC-4093
Signed-off-by: JvD_Ericsson <jeff.van.dam@est.tech>
Change-Id: I693ae5c4c7717764445b20279bf61a7d3b47b434

2 files changed, 32 insertions, 0 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadAttributeInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadAttributeInfo.java
new file mode 100644
index 0000000000..47da4c6966
--- /dev/null
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadAttributeInfo.java
@@ -0,0 +1,31 @@
+/*
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2022 Nordix Foundation. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.sdc.be.model;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class UploadAttributeInfo extends UploadInfo {
+
+    private Object value;
+
+}
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfo.java
index 95649a94de..57652ee162 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadComponentInstanceInfo.java
@@ -35,6 +35,7 @@ public class UploadComponentInstanceInfo {
     private Map<String, List<UploadReqInfo>> requirements;
     private Map<String, Map<String, UploadArtifactInfo>> artifacts;
     private Map<String, List<UploadPropInfo>> properties;
+    private Map<String, UploadAttributeInfo> attributes;
     private Map<String, String> capabilitiesNamesToUpdate;
     private Map<String, String> requirementsNamesToUpdate;
     private Collection<String> directives;