diff options
5 files changed, 161 insertions, 93 deletions
diff --git a/src/main/java/org/onap/pomba/common/datatypes/LInterface.java b/src/main/java/org/onap/pomba/common/datatypes/LInterface.java index 1eaf12d..5f851bd 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/LInterface.java +++ b/src/main/java/org/onap/pomba/common/datatypes/LInterface.java @@ -40,6 +40,10 @@ public class LInterface { @Expose @SerializedName("port") private Port port = new Port(); + @Expose + @SerializedName("logicalLinkList") + private List<LogicalLink> logicalLinkList = new ArrayList<>(); + public String getName() { return name; @@ -77,6 +81,13 @@ public class LInterface { this.port = port; } + public List<LogicalLink> getLogicalLinkList() { + return logicalLinkList; + } + + public void setLogicalLinkList(List<LogicalLink> logicalLinkList) { + this.logicalLinkList = logicalLinkList; + } } diff --git a/src/main/java/org/onap/pomba/common/datatypes/PInterface.java b/src/main/java/org/onap/pomba/common/datatypes/PInterface.java index 99bc051..f2f0a98 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/PInterface.java +++ b/src/main/java/org/onap/pomba/common/datatypes/PInterface.java @@ -45,6 +45,9 @@ public class PInterface { @Expose @SerializedName("port") private Port port; + @Expose + @SerializedName("lInterfaceList") + private List<LInterface> lInterfaceList = new ArrayList<>(); public String getName() { return name; @@ -98,7 +101,10 @@ public class PInterface { public void setPort(Port port) { this.port = port; } - - - + public List<LInterface> getLInterfaceList() { + return lInterfaceList; + } + public void setLInterfaceList(List<LInterface> lInterfaceList) { + this.lInterfaceList = lInterfaceList; + } } diff --git a/src/main/java/org/onap/pomba/common/datatypes/Service.java b/src/main/java/org/onap/pomba/common/datatypes/Service.java index b18c792..8a5702b 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/Service.java +++ b/src/main/java/org/onap/pomba/common/datatypes/Service.java @@ -1,82 +1,93 @@ -/*
- * ============LICENSE_START===================================================
- * Copyright (c) 2018 Amdocs
- * ============================================================================
- * 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.onap.pomba.common.datatypes;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Service {
-
- @Expose
- @SerializedName("uuid")
- private String uuid;
- @Expose
- @SerializedName("name")
- private String name;
- @Expose
- @SerializedName("modelVersionID")
- private String modelVersionID;
- @Expose
- @SerializedName("modelInvariantUUID")
- private String modelInvariantUUID;
- @Expose
- @SerializedName("dataQuality")
- private DataQuality dataQuality = DataQuality.ok();
- @Expose
- @SerializedName("attributeList")
- private List<Attribute> attributeList = new ArrayList<>();
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getUuid() {
- return uuid;
- }
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
- public DataQuality getDataQuality() {
- return dataQuality;
- }
- public void setDataQuality(DataQuality dataQuality) {
- this.dataQuality = dataQuality;
- }
- public List<Attribute> getAttributes() {
- return attributeList;
- }
- public void setAttributes(List<Attribute> attributeList) {
- this.attributeList = attributeList;
- }
- public String getModelVersionID() { return modelVersionID; }
- public void setModelVersionID(String modelVersionID) { this.modelVersionID = modelVersionID; }
-
- public String getModelInvariantUUID() {
- return modelInvariantUUID;
- }
-
- public void setModelInvariantUUID(String modelInvariantUUID) {
- this.modelInvariantUUID = modelInvariantUUID;
- }
-
-}
+/* + * ============LICENSE_START=================================================== + * Copyright (c) 2018 Amdocs + * ============================================================================ + * 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.onap.pomba.common.datatypes; + +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; +import java.util.ArrayList; +import java.util.List; + +public class Service { + + @Expose + @SerializedName("uuid") + private String uuid; + @Expose + @SerializedName("name") + private String name; + @Expose + @SerializedName("modelVersionID") + private String modelVersionID; + @Expose + @SerializedName("modelInvariantUUID") + private String modelInvariantUUID; + @Expose + @SerializedName("dataQuality") + private DataQuality dataQuality = DataQuality.ok(); + @Expose + @SerializedName("attributeList") + private List<Attribute> attributeList = new ArrayList<>(); + @Expose + @SerializedName("logicalLinkList") + private List<LogicalLink> logicalLinkList = new ArrayList<>(); + + + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getUuid() { + return uuid; + } + public void setUuid(String uuid) { + this.uuid = uuid; + } + public DataQuality getDataQuality() { + return dataQuality; + } + public void setDataQuality(DataQuality dataQuality) { + this.dataQuality = dataQuality; + } + public List<Attribute> getAttributes() { + return attributeList; + } + public void setAttributes(List<Attribute> attributeList) { + this.attributeList = attributeList; + } + public String getModelVersionID() { return modelVersionID; } + public void setModelVersionID(String modelVersionID) { this.modelVersionID = modelVersionID; } + + public String getModelInvariantUUID() { + return modelInvariantUUID; + } + + public void setModelInvariantUUID(String modelInvariantUUID) { + this.modelInvariantUUID = modelInvariantUUID; + } + + public List<LogicalLink> getLogicalLinkList() { + return logicalLinkList; + } + + public void setLogicalLinkList(List<LogicalLink> logicalLinkList) { + this.logicalLinkList = logicalLinkList; + } +} diff --git a/src/main/java/org/onap/pomba/common/datatypes/VNF.java b/src/main/java/org/onap/pomba/common/datatypes/VNF.java index 49db2f9..661bfad 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/VNF.java +++ b/src/main/java/org/onap/pomba/common/datatypes/VNF.java @@ -56,6 +56,9 @@ public class VNF { @Expose @SerializedName("networkList") private List<Network> networks = new ArrayList<>(); + @Expose + @SerializedName("lInterfaceList") + private List<LInterface> lInterfaceList = new ArrayList<>(); public String getName() { return name; @@ -125,4 +128,11 @@ public class VNF { this.networks = networks; } + public List<LInterface> getLInterfaceList() { + return lInterfaceList; + } + public void setLInterfaceList(List<LInterface> lInterfaceList) { + this.lInterfaceList = lInterfaceList; + } + } diff --git a/src/main/resources/commonModel.html b/src/main/resources/commonModel.html index e3f6498..2654b4c 100644 --- a/src/main/resources/commonModel.html +++ b/src/main/resources/commonModel.html @@ -828,6 +828,21 @@ POMBA Audit Context Builder API <td></td> </tr> + <tr> + <td>linterfaceList</td> + <td> + + + array[<a href="#/definitions/LInterface">LInterface</a>] + + + + </td> + <td>optional</td> + <td>-</td> + <td></td> + </tr> + </table> ## <a name="/definitions/PNF">PNF</a> @@ -1475,13 +1490,11 @@ POMBA Audit Context Builder API </tr> <tr> - <td>linterfaceList</td> + <td>pserver</td> <td> - - array[<a href="#/definitions/LInterface">LInterface</a>] - - + <a href="#/definitions/Pserver">Pserver</a> + </td> <td>optional</td> @@ -1490,11 +1503,13 @@ POMBA Audit Context Builder API </tr> <tr> - <td>pserver</td> + <td>linterfaceList</td> <td> - <a href="#/definitions/Pserver">Pserver</a> - + + array[<a href="#/definitions/LInterface">LInterface</a>] + + </td> <td>optional</td> @@ -1653,6 +1668,21 @@ POMBA Audit Context Builder API <td></td> </tr> + <tr> + <td>linterfaceList</td> + <td> + + + array[<a href="#/definitions/LInterface">LInterface</a>] + + + + </td> + <td>optional</td> + <td>-</td> + <td></td> + </tr> + </table> ## <a name="/definitions/VNFC">VNFC</a> |