diff options
4 files changed, 66 insertions, 8 deletions
diff --git a/src/main/java/org/onap/pomba/common/datatypes/Attribute.java b/src/main/java/org/onap/pomba/common/datatypes/Attribute.java index a53263e..13e9401 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/Attribute.java +++ b/src/main/java/org/onap/pomba/common/datatypes/Attribute.java @@ -74,7 +74,12 @@ public class Attribute { resourceVersion, name2Source, managementOptions, - frameId + frameId, + ptniiName, + topology, + purpose, + description, + equipmentID } @ApiModelProperty(value = "Name of the attribute") public Name getName() { diff --git a/src/main/java/org/onap/pomba/common/datatypes/PNF.java b/src/main/java/org/onap/pomba/common/datatypes/PNF.java index 1aa6836..6d8b45d 100644 --- a/src/main/java/org/onap/pomba/common/datatypes/PNF.java +++ b/src/main/java/org/onap/pomba/common/datatypes/PNF.java @@ -43,6 +43,12 @@ public class PNF { @Expose @SerializedName("attributeList") private List<Attribute> attributeList = new ArrayList<>(); + @Expose + @SerializedName("networkList") + private List<Network> networkList = new ArrayList<>(); + @Expose + @SerializedName("pInterfaceList") + private List<PInterface> pInterfaceList = new ArrayList<>(); public String getName() { return name; @@ -80,4 +86,21 @@ public class PNF { this.modelInvariantUUID = modelInvariantUUID; } + public List<Network> getNetworkList() { + return networkList; + } + + public void setNetworkList(List<Network> networkList) { + this.networkList = networkList; + } + + public List<PInterface> getPInterfaceList() { + return pInterfaceList; + } + + public void setPInterfaceList(List<PInterface> pInterfaceList) { + this.pInterfaceList = pInterfaceList; + } + + } diff --git a/src/main/resources/commonModel.html b/src/main/resources/commonModel.html index 3723c3b..f4b51f6 100644 --- a/src/main/resources/commonModel.html +++ b/src/main/resources/commonModel.html @@ -514,32 +514,32 @@ POMBA Audit Context Builder API </tr> <tr> - <td>pnfs</td> + <td>vnfs</td> <td> - array[<a href="#/definitions/PNF">PNF</a>] + array[<a href="#/definitions/VNF">VNF</a>] </td> <td>optional</td> - <td>List of PNF associated with the service instance</td> + <td>List of VNF associated with the service instance</td> <td></td> </tr> <tr> - <td>vnfs</td> + <td>pnfs</td> <td> - array[<a href="#/definitions/VNF">VNF</a>] + array[<a href="#/definitions/PNF">PNF</a>] </td> <td>optional</td> - <td>List of VNF associated with the service instance</td> + <td>List of PNF associated with the service instance</td> <td></td> </tr> @@ -892,6 +892,21 @@ POMBA Audit Context Builder API </tr> <tr> + <td>networks</td> + <td> + + + array[<a href="#/definitions/Network">Network</a>] + + + + </td> + <td>optional</td> + <td>-</td> + <td></td> + </tr> + + <tr> <td>attributes</td> <td> @@ -906,6 +921,21 @@ POMBA Audit Context Builder API <td></td> </tr> + <tr> + <td>pinterfaceList</td> + <td> + + + array[<a href="#/definitions/PInterface">PInterface</a>] + + + + </td> + <td>optional</td> + <td>-</td> + <td></td> + </tr> + </table> ## <a name="/definitions/PhysicalLink">PhysicalLink</a> diff --git a/src/test/java/org/onap/pomba/common/datatypes/PNFTests.java b/src/test/java/org/onap/pomba/common/datatypes/PNFTests.java index 0f0af29..baea5e3 100644 --- a/src/test/java/org/onap/pomba/common/datatypes/PNFTests.java +++ b/src/test/java/org/onap/pomba/common/datatypes/PNFTests.java @@ -19,7 +19,7 @@ package org.onap.pomba.common.datatypes; import org.junit.Test; -import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class PNFTests { |