[AAI] Release 1.13.1 docker artifact of babel

[aai/babel.git] / src / main / java / org / onap / aai / babel / xml / generator / api / AaiModelGenerator.java

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
index 91eb6a4..69bbb80 100644 (file)
--- a/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/api/AaiModelGenerator.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Copyright (c) 2017-2019 European Software Marketing Ltd.
+ * Copyright (C) 2019-2020 Wipro Limited.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -79,7 +80,9 @@ public class AaiModelGenerator {
         org.onap.aai.babel.xml.generator.xsd.Model aaiModel = new org.onap.aai.babel.xml.generator.xsd.Model();
         aaiModel.setModelInvariantId(model.getModelId());
         aaiModel.setModelType(model.getModelTypeName());
-
+        if ("service".equals(model.getModelTypeName())){
+            aaiModel.setModelRole(model.getCategory());
+        }
         aaiModel.setModelVers(new ModelVers());
         aaiModel.getModelVers().getModelVer().add(createModelVersion(model));
 
@@ -100,6 +103,8 @@ public class AaiModelGenerator {
         modelVer.setModelName(model.getModelName());
         modelVer.setModelVersion(model.getModelVersion());
         modelVer.setModelVersionId(model.getModelNameVersionId());
+        modelVer.setSdncModelName(model.getSdncModelName());
+        modelVer.setSdncModelVersion(model.getSdncModelVersion());
         modelVer.setModelElements(new ModelElements());
         return modelVer;
     }
@@ -138,8 +143,7 @@ public class AaiModelGenerator {
      * @throws XmlArtifactGenerationException
      */
     private ModelElement createWidgetRelationshipModelElement(Model model) throws XmlArtifactGenerationException {
-        return createRelationshipModelElement(model.getDeleteFlag(), model.getWidgetId(),
-                model.getWidgetInvariantId());
+        return createRelationshipModelElement(model.getDeleteFlag(), model.getWidgetId(), model.getWidgetInvariantId());
     }
 
     /**