From 7704322bfb8f5d173392cbbb2052dd9f2e7b86f8 Mon Sep 17 00:00:00 2001 From: "Leigh, Phillip (pl876u)" Date: Thu, 21 Feb 2019 14:08:25 -0500 Subject: Update Data Model with L-Interface Issue-ID: LOG-767 Issue-ID: LOG-766 Change-Id: Iec7c4b2ff9b276e6ef1e9d61c8abc007198cbf97 Signed-off-by: Leigh, Phillip (pl876u) --- .../onap/pomba/common/datatypes/LInterface.java | 11 ++ .../onap/pomba/common/datatypes/PInterface.java | 12 +- .../org/onap/pomba/common/datatypes/Service.java | 175 +++++++++++---------- .../java/org/onap/pomba/common/datatypes/VNF.java | 10 ++ src/main/resources/commonModel.html | 46 +++++- 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 logicalLinkList = new ArrayList<>(); + public String getName() { return name; @@ -77,6 +81,13 @@ public class LInterface { this.port = port; } + public List getLogicalLinkList() { + return logicalLinkList; + } + + public void setLogicalLinkList(List 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 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 getLInterfaceList() { + return lInterfaceList; + } + public void setLInterfaceList(List 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 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 getAttributes() { - return attributeList; - } - public void setAttributes(List 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 attributeList = new ArrayList<>(); + @Expose + @SerializedName("logicalLinkList") + private List 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 getAttributes() { + return attributeList; + } + public void setAttributes(List 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 getLogicalLinkList() { + return logicalLinkList; + } + + public void setLogicalLinkList(List 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 networks = new ArrayList<>(); + @Expose + @SerializedName("lInterfaceList") + private List lInterfaceList = new ArrayList<>(); public String getName() { return name; @@ -125,4 +128,11 @@ public class VNF { this.networks = networks; } + public List getLInterfaceList() { + return lInterfaceList; + } + public void setLInterfaceList(List 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 @@ -822,6 +822,21 @@ POMBA Audit Context Builder API + + optional + - + + + + + linterfaceList + + + + array[LInterface] + + + optional - @@ -1475,13 +1490,11 @@ POMBA Audit Context Builder API - linterfaceList + pserver - - array[LInterface] - - + Pserver + optional @@ -1490,11 +1503,13 @@ POMBA Audit Context Builder API - pserver + linterfaceList - Pserver - + + array[LInterface] + + optional @@ -1647,6 +1662,21 @@ POMBA Audit Context Builder API + + optional + - + + + + + linterfaceList + + + + array[LInterface] + + + optional - -- cgit 1.2.3-korg