Merge "Fix macro flow resource blocks processing order"

4 files changed, 54 insertions, 6 deletions

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java
index 8f795df654..8e8f40caca 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Networks.java
@@ -5,6 +5,8 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2021 Orange
+ * ================================================================================
  * 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
@@ -45,6 +47,8 @@ public class Networks implements Serializable {
     protected String productFamilyId;
     @JsonProperty("instanceParams")
     private List<Map<String, String>> instanceParams = new ArrayList<>();
+    @JsonProperty("processingPriority")
+    protected Integer processingPriority = 0;
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -86,10 +90,19 @@ public class Networks implements Serializable {
         this.instanceParams = instanceParams;
     }
 
+    public Integer getProcessingPriority() {
+        return processingPriority;
+    }
+
+    public void setProcessingPriority(Integer processingPriority) {
+        this.processingPriority = processingPriority;
+    }
+
     @Override
     public String toString() {
         return "Networks [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
-                + instanceName + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams + "]";
+                + instanceName + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams
+                + ", processingPriority=" + processingPriority + "]";
     }
 
 }
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java
index f601ebc3bd..027a3be387 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Pnfs.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2019 Nokia
  * ================================================================================
+ * Modifications Copyright (c) 2021 Orange
+ * ================================================================================
  * 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
@@ -46,7 +48,8 @@ public class Pnfs implements Serializable {
     protected String productFamilyId;
     @JsonProperty("instanceParams")
     private List<Map<String, String>> instanceParams = new ArrayList<>();
-
+    @JsonProperty("processingPriority")
+    protected Integer processingPriority = 0;
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -104,11 +107,20 @@ public class Pnfs implements Serializable {
         this.instanceParams = instanceParams;
     }
 
+    public Integer getProcessingPriority() {
+        return processingPriority;
+    }
+
+    public void setProcessingPriority(Integer processingPriority) {
+        this.processingPriority = processingPriority;
+    }
+
     @Override
     public String toString() {
         return "Pnfs [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
                 + instanceName + ", platform=" + platform + ", " + "lineOfBusiness=" + lineOfBusiness
-                + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams + "]";
+                + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams
+                + ", processingPriority=" + processingPriority + "]";
     }
 
 }
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java b/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java
index 5c4834d021..d4d1f89577 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/VfModules.java
@@ -5,6 +5,8 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2021 Orange
+ * ================================================================================
  * 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
@@ -45,7 +47,8 @@ public class VfModules implements Serializable {
     protected String volumeGroupInstanceName;
     @JsonProperty("instanceParams")
     private List<Map<String, String>> instanceParams = new ArrayList<>();
-
+    @JsonProperty("processingPriority")
+    protected Integer processingPriority = 0;
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -87,11 +90,19 @@ public class VfModules implements Serializable {
         this.instanceParams = instanceParams;
     }
 
+    public Integer getProcessingPriority() {
+        return processingPriority;
+    }
+
+    public void setProcessingPriority(Integer processingPriority) {
+        this.processingPriority = processingPriority;
+    }
+
     @Override
     public String toString() {
         return "VfModules [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
                 + instanceName + ", volumeGroupInstanceName=" + volumeGroupInstanceName + ", instanceParams="
-                + instanceParams + "]";
+                + instanceParams + ", processingPriority=" + processingPriority + "]";
     }
 
 }
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
index ca67f566b1..f098d844a6 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
@@ -5,6 +5,8 @@
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2021 Orange
+ * ================================================================================
  * 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
@@ -53,6 +55,8 @@ public class Vnfs implements Serializable {
     private List<VfModules> vfModules = new ArrayList<>();
     @JsonProperty("applicationId")
     protected String applicationId;
+    @JsonProperty("processingPriority")
+    protected Integer processingPriority = 0;
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -126,12 +130,20 @@ public class Vnfs implements Serializable {
         this.applicationId = applicationId;
     }
 
+    public Integer getProcessingPriority() {
+        return processingPriority;
+    }
+
+    public void setProcessingPriority(Integer processingPriority) {
+        this.processingPriority = processingPriority;
+    }
+
     @Override
     public String toString() {
         return "Vnfs [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
                 + instanceName + ", platform=" + platform + ", " + "lineOfBusiness=" + lineOfBusiness
                 + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams + ", vfModules="
-                + vfModules + ", applicaionId=" + applicationId + " ]";
+                + vfModules + ", applicaionId=" + applicationId + ", processingPriority=" + processingPriority + " ]";
     }
 
 }