Update aai-schema dependency

- update aai-schema (1.12.6 -> 1.12.10)

Issue-ID: SO-4210
Change-Id: I9acd3874306f622f998189d9b03966964bc4c7e0
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/ModifyRANNssiBBTask.java b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/ModifyRANNssiBBTask.java
index eba3567..a6d09a5 100644 (file)
--- a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/ModifyRANNssiBBTask.java
+++ b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/ModifyRANNssiBBTask.java
@@ -23,6 +23,7 @@ package org.onap.so.bpmn.moi.tasks;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.onap.aai.domain.yang.MaxNumberOfUes;
 import org.onap.aai.domain.yang.ServiceInstance;
 import org.onap.aai.domain.yang.SliceProfile;
 import org.onap.aaiclient.client.aai.AAIRestClientImpl;
@@ -160,7 +161,11 @@ public class ModifyRANNssiBBTask {
                         case "maxNumberofUEs":
                             Integer maxNumberofUEs = (Integer) ranMap.get(k);
                             LOGGER.info("maxNumberofUEs {}", maxNumberofUEs);
-                            sliceProfile.setMaxNumberOfUEs(maxNumberofUEs);
+                            LOGGER.warn("Setting max-number-of-ues is not supported yet, setting empty value");
+                            sliceProfile.setMaxNumberOfUes(new MaxNumberOfUes()); // TODO: adjust
+                                                                                  // org.onap.so.moi.SliceProfile to
+                                                                                  // allow
+                                                                                  // to set a proper value here
                             break;
 
                     }

diff --git a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java
index 1cbdabf..cd83951 100644 (file)
--- a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java
+++ b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/util/SliceProfileAaiToMoiMapperUtil.java
@@ -21,16 +21,23 @@
 
 package org.onap.so.bpmn.moi.util;
 
+import org.onap.aai.domain.yang.MaxNumberOfUes;
 import org.onap.aai.domain.yang.ServiceInstance;
 import org.onap.aai.domain.yang.SliceProfile;
+import org.onap.so.bpmn.moi.tasks.AssignRANNssiBBTasks;
 import org.onap.so.moi.Attributes;
 import org.onap.so.moi.PlmnId;
 import org.onap.so.moi.Snssai;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
 public class SliceProfileAaiToMoiMapperUtil {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(SliceProfileAaiToMoiMapperUtil.class);
+
+
     public ServiceInstance fillSliceProfileInstanceFromMoiRequest(Attributes moiRequestAttributes,
             ServiceInstance serviceInstance) {
 
@@ -84,7 +91,9 @@ public class SliceProfileAaiToMoiMapperUtil {
         Integer coverageAreaTAList = moiSliceProfile.getRANSliceSubnetProfile().getCoverageAreaTAList();
 
         aaiSliceProfile.setLatency(latency);
-        aaiSliceProfile.setMaxNumberOfUEs(maxNumberOfUEs);
+        LOGGER.warn("Setting max-number-of-ues is not supported yet, setting empty value");
+        aaiSliceProfile.setMaxNumberOfUes(new MaxNumberOfUes()); // TODO: adjust org.onap.so.moi.SliceProfile to allow
+                                                                 // to set a proper value here
         aaiSliceProfile.setResourceSharingLevel(resourceSharingLevel);
         aaiSliceProfile.setCoverageAreaTAList(String.valueOf(coverageAreaTAList));
         aaiSliceProfile.setAreaTrafficCapDL(areaTrafficCapDL);

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java
index 4a4f8d8..505ad09 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java
@@ -260,7 +260,7 @@ public class ManagedObject3gppServiceInstances {
         ranSliceSubnetProfile.setServiceType(serviceType);
         ranSliceSubnetProfile.setdLLatency(sliceProfile.getLatency());
         ranSliceSubnetProfile.setCoverageAreaTAList(Integer.valueOf(sliceProfile.getCoverageAreaTAList()));
-        ranSliceSubnetProfile.setMaxNumberofUEs(sliceProfile.getMaxNumberOfUEs());
+        ranSliceSubnetProfile.setMaxNumberofUEs(sliceProfile.getMaxNumberOfUes().getMaxNumberOfUe().size());
         ranSliceSubnetProfile.setResourceSharingLevel(sliceProfile.getResourceSharingLevel());
         ranSliceSubnetProfile.setAreaTrafficCapDL(sliceProfile.getAreaTrafficCapDL());
 

diff --git a/pom.xml b/pom.xml
index ce9cecd..4a003a6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
     <grpc.version>1.25.0</grpc.version>
     <logback.version>1.2.11</logback.version>
     <kafka-clients.version>3.3.2</kafka-clients.version>
-    <aai-schema.version>1.12.6</aai-schema.version>
+    <aai-schema.version>1.12.10</aai-schema.version>
   </properties>
   <distributionManagement>
     <repository>