Enhance model to support L2 Fabric

Adding JUnit tests and swagger specs

Issue-ID: LOG-780
Change-Id: Iaf7cb19a6310ebdeef085a94f00623041aa4f89b
Signed-off-by: Geora Barsky <georab@amdocs.com>

17 files changed, 1031 insertions, 201 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 1bf32bc..c940322 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Attribute.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Attribute.java
@@ -20,6 +20,7 @@ package org.onap.pomba.common.datatypes;
 

 import com.google.gson.annotations.Expose;

 import com.google.gson.annotations.SerializedName;

+import io.swagger.annotations.ApiModelProperty;

 

 public class Attribute {

     @Expose

@@ -33,7 +34,7 @@ public class Attribute {
     private DataQuality dataQuality = DataQuality.ok();

 

     public enum Name {

-        adminState,

+        adminStatus,

         ipAddress,

         hostName,

         lockedBoolean,

@@ -44,20 +45,49 @@ public class Attribute {
         sharedNetworkBoolean,

         networkRole,

         routerExternalBoolean,

-        imageId

+        imageId,

+        nfNamingCode,

+        nfType,

+        nfRole,

+        nfFunction,

+        nfcNamingCode,

+        nfcNamingTypen,

+        name2,

+        equipType,

+        equipVendor,

+        equipModel,

+        swVesrion,

+        serialNumber,

+        provStatus,

+        fqdn,

+        interfaceRole,

+        interfaceType,

+        speedValue,

+        speedUnits,

+        portDescription,

+        circuitId,

+        linkType,

+        routingProtocol,

+        networkName,

+        isPortMirrored

     }

+    @ApiModelProperty(value = "Name of the attribute")

     public Name getName() {

         return name;

     }

     public void setName(Name name) {

         this.name = name;

     }

+

+    @ApiModelProperty(value = "Value of the attribute")

     public String getValue() {

         return value;

     }

     public void setValue(String value) {

         this.value = value;

     }

+

+    @ApiModelProperty(value = "Data Quality indicator of the attribute")

     public DataQuality getDataQuality() {

         return dataQuality;

     }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/LInterface.java b/src/main/java/org/onap/pomba/common/datatypes/LInterface.java
new file mode 100644
index 0000000..1eaf12d
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/LInterface.java
@@ -0,0 +1,82 @@
+/*
+ * ============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 LInterface {
+
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @Expose
+    @SerializedName("dataQuality")
+    private DataQuality dataQuality = DataQuality.ok();
+    @Expose
+    @SerializedName("attributeList")
+    private List<Attribute> attributeList = new ArrayList<>();
+    @Expose
+    @SerializedName("port")
+    private Port port = new Port();
+
+    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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+
+    public Port getPort() {
+        return port;
+    }
+
+    public void setPort(Port port) {
+        this.port = port;
+    }
+
+
+}
+
diff --git a/src/main/java/org/onap/pomba/common/datatypes/LogicalLink.java b/src/main/java/org/onap/pomba/common/datatypes/LogicalLink.java
new file mode 100644
index 0000000..7b1de66
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/LogicalLink.java
@@ -0,0 +1,88 @@
+/*
+ * ============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 LogicalLink {
+
+    @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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+    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;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
index 1fc8118..0564b2f 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/ModelContext.java
@@ -20,9 +20,13 @@ package org.onap.pomba.common.datatypes;
 

 import com.google.gson.annotations.Expose;

 import com.google.gson.annotations.SerializedName;

+import io.swagger.annotations.ApiModel;

+import io.swagger.annotations.ApiModelProperty;

+

 import java.util.ArrayList;

 import java.util.List;

 

+@ApiModel(value="ModelContext")

 public class ModelContext {

 

     @Expose

@@ -35,21 +39,30 @@ public class ModelContext {
     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

     @Expose

-    @SerializedName("vfList")

-    private List<VF> vfList = new ArrayList<>();

+    @SerializedName("vnfList")

+    private List<VNF> vnfList = new ArrayList<>();

+    @Expose

+    @SerializedName("pnfList")

+    private List<PNF> pnfList = new ArrayList<>();

+    @Expose

+    @SerializedName("networkList")

+    private List<Network> networkList = new ArrayList<>();

 

+    @ApiModelProperty(value = "Service object of the model")

     public Service getService() {

         return service;

     }

     public void setService(Service service) {

         this.service = service;

     }

+    @ApiModelProperty(value = "Data Quality indicator")

     public DataQuality getDataQuality() {

         return dataQuality;

     }

     public void setDataQuality(DataQuality dataQuality) {

         this.dataQuality = dataQuality;

     }

+    @ApiModelProperty(value = "List of attributes")

     public List<Attribute> getAttributes() {

         return attributeList;

     }

@@ -59,13 +72,31 @@ public class ModelContext {
     public void addAttribute(Attribute attribute) {

         this.attributeList.add(attribute);

     }

-    public List<VF> getVfs() {

-        return vfList;

+    @ApiModelProperty(value = "List of VNF associated with the service instance")

+    public List<VNF> getVnfs() {

+        return vnfList;

+    }

+    public void setVnfs(List<VNF> vfList) {

+        this.vnfList = vfList;

     }

-    public void setVfs(List<VF> vfList) {

-        this.vfList = vfList;

+    public void addVf(VNF vf) {

+        this.vnfList.add(vf);

     }

-    public void addVf(VF vf) {

-        this.vfList.add(vf);

+    @ApiModelProperty(value = "List of PNF associated with the service instance")

+    public List<PNF> getPnfs() {

+        return pnfList;

     }

+    public void setPnfs(List<PNF> pnfList) {

+        this.pnfList = pnfList;

+    }

+    public void addPnf(PNF pnf) {

+        this.pnfList.add(pnf);

+    }

+    @ApiModelProperty(value = "List of networks associated with the service instance")

+    public List<Network> getNetworkList() { return networkList; }

+    public void setNetworkList(List<Network> networkList) { this.networkList = networkList; }

+    public void addNetwork(Network network) {

+        this.networkList.add(network);

+    }

+

 }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/Network.java b/src/main/java/org/onap/pomba/common/datatypes/Network.java
index 171c6a5..9ba96e1 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Network.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Network.java
@@ -25,23 +25,26 @@ import java.util.List;
 

 public class Network {

     @Expose

+    @SerializedName("uuid")

+    private String uuid;

+    @Expose

     @SerializedName("name")

     private String name;

     @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

-    @Expose

-    @SerializedName("uuid")

-    private String uuid;

+    @SerializedName("modelVersionID")

+    private String modelVersionID;

     @Expose

-    @SerializedName("type")

-    private String type;

+    @SerializedName("modelInvariantUUID")

+    private String modelInvariantUUID;

     @Expose

     @SerializedName("dataQuality")

     private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

+    @Expose

+    @SerializedName("networkPolicyList")

+    private List<NetworkPolicy> networkPolicies = new ArrayList<>();

 

     public String getName() {

         return name;

@@ -49,24 +52,12 @@ public class Network {
     public void setName(String name) {

         this.name = name;

     }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

     public String getUuid() {

         return uuid;

     }

     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getType() {

-        return type;

-    }

-    public void setType(String type) {

-        this.type = type;

-    }

     public List<Attribute> getAttributes() {

         return attributeList;

     }

@@ -82,5 +73,23 @@ public class Network {
     public void setDataQuality(DataQuality dataQuality) {

         this.dataQuality = dataQuality;

     }

+    public String getModelVersionID() { return modelVersionID; }

+    public void setModelVersionID(String modelVersionID) { this.modelVersionID = modelVersionID; }

+

+    public List<NetworkPolicy> getNetworkPolicies() {

+        return networkPolicies;

+    }

+

+    public void setNetworkPolicies(List<NetworkPolicy> networkPolicies) {

+        this.networkPolicies = networkPolicies;

+    }

+

+    public String getModelInvariantUUID() {

+        return modelInvariantUUID;

+    }

+

+    public void setModelInvariantUUID(String modelInvariantUUID) {

+        this.modelInvariantUUID = modelInvariantUUID;

+    }

 

 }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/NetworkPolicy.java b/src/main/java/org/onap/pomba/common/datatypes/NetworkPolicy.java
new file mode 100644
index 0000000..348642d
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/NetworkPolicy.java
@@ -0,0 +1,72 @@
+/*
+ * ============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 NetworkPolicy {
+
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+
+
+
+}
+
diff --git a/src/main/java/org/onap/pomba/common/datatypes/PInterface.java b/src/main/java/org/onap/pomba/common/datatypes/PInterface.java
new file mode 100644
index 0000000..8b55aa5
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/PInterface.java
@@ -0,0 +1,92 @@
+/*
+ * ============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 PInterface {
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @Expose
+    @SerializedName("dataQuality")
+    private DataQuality dataQuality = DataQuality.ok();
+    @Expose
+    @SerializedName("attributeList")
+    private List<Attribute> attributeList = new ArrayList<>();
+    @Expose
+    @SerializedName("physicalLinkList")
+    private List<PhysicalLink> physicalLinkList = new ArrayList<>();
+    @Expose
+    @SerializedName("port")
+    private Port port;
+
+    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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+
+    public List<PhysicalLink> getPhysicalLinkList() {
+        return physicalLinkList;
+    }
+
+    public void setPhysicalLinkList(List<PhysicalLink> physicalLinkList) {
+        this.physicalLinkList = physicalLinkList;
+    }
+
+    public Port getPort() {
+        return port;
+    }
+
+    public void setPort(Port port) {
+        this.port = port;
+    }
+
+
+
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/PNF.java b/src/main/java/org/onap/pomba/common/datatypes/PNF.java
new file mode 100644
index 0000000..1aa6836
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/PNF.java
@@ -0,0 +1,83 @@
+/*
+ * ============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 java.util.ArrayList;
+import java.util.List;
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class PNF {
+
+    @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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; }
+    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;
+    }
+
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/PhysicalLink.java b/src/main/java/org/onap/pomba/common/datatypes/PhysicalLink.java
new file mode 100644
index 0000000..e89a1de
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/PhysicalLink.java
@@ -0,0 +1,72 @@
+/*
+ * ============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 PhysicalLink {
+
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+
+
+
+}
+
diff --git a/src/main/java/org/onap/pomba/common/datatypes/Port.java b/src/main/java/org/onap/pomba/common/datatypes/Port.java
new file mode 100644
index 0000000..bced3b7
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/Port.java
@@ -0,0 +1,71 @@
+/*
+ * ============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 Port {
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+
+
+
+}
+
diff --git a/src/main/java/org/onap/pomba/common/datatypes/Pserver.java b/src/main/java/org/onap/pomba/common/datatypes/Pserver.java
new file mode 100644
index 0000000..ad04bad
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/datatypes/Pserver.java
@@ -0,0 +1,89 @@
+/*
+ * ============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 Pserver {
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @Expose
+    @SerializedName("dataQuality")
+    private DataQuality dataQuality = DataQuality.ok();
+    @Expose
+    @SerializedName("attributeList")
+    private List<Attribute> attributeList = new ArrayList<>();
+    @Expose
+    @SerializedName("pInterfaceList")
+    private List<PInterface> pInterfaceList = 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 List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) {
+        this.dataQuality = dataQuality;
+    }
+    public List<PInterface> getPInterfaceList() {
+        return pInterfaceList;
+    }
+    public void setPInterfaceList(List<PInterface> pInterfaceList) {
+        this.pInterfaceList = pInterfaceList;
+    }
+
+    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/Service.java b/src/main/java/org/onap/pomba/common/datatypes/Service.java
index 1579434..b18c792 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/Service.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/Service.java
@@ -26,14 +26,17 @@ import java.util.List;
 public class Service {

 

     @Expose

+    @SerializedName("uuid")

+    private String uuid;

+    @Expose

     @SerializedName("name")

     private String name;

     @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

+    @SerializedName("modelVersionID")

+    private String modelVersionID;

     @Expose

-    @SerializedName("uuid")

-    private String uuid;

+    @SerializedName("modelInvariantUUID")

+    private String modelInvariantUUID;

     @Expose

     @SerializedName("dataQuality")

     private DataQuality dataQuality = DataQuality.ok();

@@ -47,12 +50,6 @@ public class Service {
     public void setName(String name) {

         this.name = name;

     }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

     public String getUuid() {

         return uuid;

     }

@@ -71,7 +68,15 @@ public class Service {
     public void setAttributes(List<Attribute> attributeList) {

         this.attributeList = attributeList;

     }

-    public void addAttribute(Attribute attribute) {

-        this.attributeList.add(attribute);

+    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;

+    }

+

 }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VFModule.java b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
index 9d19dc0..3ea8ede 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VFModule.java
@@ -26,14 +26,20 @@ import java.util.List;
 public class VFModule {

 

     @Expose

+    @SerializedName("uuid")

+    private String uuid;

+    @Expose

     @SerializedName("name")

     private String name;

     @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

+    @SerializedName("modelVersionID")

+    private String modelVersionID;

     @Expose

-    @SerializedName("uuid")

-    private String uuid;

+    @SerializedName("modelInvariantUUID")

+    private String modelInvariantUUID;

+    @Expose

+    @SerializedName("modelCustomizationUUID")

+    private String modelCustomizationUUID;

     @Expose

     @SerializedName("maxInstances")

     private int maxInstances;

@@ -60,12 +66,6 @@ public class VFModule {
     public void setName(String name) {

         this.name = name;

     }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

     public String getUuid() {

         return uuid;

     }

@@ -117,4 +117,18 @@ public class VFModule {
     public void setDataQuality(DataQuality dataQuality) {

         this.dataQuality = dataQuality;

     }

+    public String getModelVersionID() { return modelVersionID; }

+    public void setModelVersionID(String modelVersionID) { this.modelVersionID = modelVersionID; }

+    public String getModelCustomizationUUID() { return modelCustomizationUUID; }

+    public void setModelCustomizationUUID(String modelCustomizationUUID) { this.modelCustomizationUUID = modelCustomizationUUID; }

+

+    public String getModelInvariantUUID() {

+        return modelInvariantUUID;

+    }

+

+    public void setModelInvariantUUID(String modelInvariantUUID) {

+        this.modelInvariantUUID = modelInvariantUUID;

+    }

+

+

 }

diff --git a/src/main/java/org/onap/pomba/common/datatypes/VM.java b/src/main/java/org/onap/pomba/common/datatypes/VM.java
index 0b4be65..1371e07 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VM.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VM.java
@@ -25,23 +25,23 @@ import java.util.List;
 

 public class VM {

     @Expose

-    @SerializedName("name")

-    private String name;

-    @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

-    @Expose

     @SerializedName("uuid")

     private String uuid;

     @Expose

-    @SerializedName("nfNamingCode")

-    private String nfcNamingCode;

+    @SerializedName("name")

+    private String name;

     @Expose

     @SerializedName("dataQuality")

     private DataQuality dataQuality = DataQuality.ok();

     @Expose

     @SerializedName("attributeList")

     private List<Attribute> attributeList = new ArrayList<>();

+    @Expose

+    @SerializedName("pServer")

+    private Pserver pServer = new Pserver();

+    @Expose

+    @SerializedName("lInterfaceList")

+    private List<LInterface> lInterfaceList = new ArrayList<>();

 

     public String getName() {

         return name;

@@ -49,24 +49,12 @@ public class VM {
     public void setName(String name) {

         this.name = name;

     }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

     public String getUuid() {

         return uuid;

     }

     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getNfcNamingCode() {

-        return nfcNamingCode;

-    }

-    public void setNfcNamingCode(String nfcType) {

-        this.nfcNamingCode = nfcType;

-    }

     public List<Attribute> getAttributes() {

         return attributeList;

     }

@@ -83,4 +71,22 @@ public class VM {
         this.dataQuality = dataQuality;

     }

 

+    public Pserver getPServer() {

+        return pServer;

+    }

+

+    public void setPServer(Pserver pServer) {

+        this.pServer = pServer;

+    }

+

+    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/VF.java b/src/main/java/org/onap/pomba/common/datatypes/VNF.java
index ded7ae2..49db2f9 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VF.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VNF.java
@@ -1,111 +1,128 @@
-/*

- * ============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 java.util.ArrayList;

-import java.util.List;

-

-import com.google.gson.annotations.Expose;

-import com.google.gson.annotations.SerializedName;

-

-public class VF {

-

-    @Expose

-    @SerializedName("name")

-    private String name;

-    @Expose

-    @SerializedName("type")

-    private String type;

-    @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

-    @Expose

-    @SerializedName("uuid")

-    private String uuid;

-    @Expose

-    @SerializedName("dataQuality")

-    private DataQuality dataQuality = DataQuality.ok();

-    @Expose

-    @SerializedName("attributeList")

-    private List<Attribute> attributeList = new ArrayList<>();

-    @Expose

-    @SerializedName("vfModuleList")

-    private List<VFModule> vfModules = new ArrayList<>();

-    @Expose

-    @SerializedName("vnfcList")

-    private List<VNFC> vnfcs = new ArrayList<>();

-

-    public String getName() {

-        return name;

-    }

-    public void setName(String name) {

-        this.name = name;

-    }

-    public String getType() {

-        return type;

-    }

-    public void setType(String type) {

-        this.type = type;

-    }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

-    public String getUuid() {

-        return uuid;

-    }

-    public void setUuid(String uuid) {

-        this.uuid = uuid;

-    }

-    public List<VFModule> getVfModules() {

-        return vfModules;

-    }

-    public void setVfModules(List<VFModule> vfModules) {

-        this.vfModules = vfModules;

-    }

-    public void addVfModule(VFModule vfModule) {

-        this.vfModules.add(vfModule);

-    }

-    public List<VNFC> getVnfcs() {

-        return vnfcs;

-    }

-    public void setVnfcs(List<VNFC> vnfc) {

-        this.vnfcs = vnfc;

-    }

-    public void addVnfc(VNFC vnfc) {

-        this.vnfcs.add(vnfc);

-    }

-    public List<Attribute> getAttributes() {

-        return attributeList;

-    }

-    public void setAttributes(List<Attribute> attributeList) {

-        this.attributeList = attributeList;

-    }

-    public void addAttribute(Attribute attribute) {

-        this.attributeList.add(attribute);

-    }

-    public DataQuality getDataQuality() {

-        return dataQuality;

-    }

-    public void setDataQuality(DataQuality dataQuality) {

-        this.dataQuality = dataQuality;

-    }

-}

+/*
+ * ============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 java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class VNF {
+
+    @Expose
+    @SerializedName("uuid")
+    private String uuid;
+    @Expose
+    @SerializedName("name")
+    private String name;
+    @Expose
+    @SerializedName("type")
+    private String type;
+    @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("vfModuleList")
+    private List<VFModule> vfModules = new ArrayList<>();
+    @Expose
+    @SerializedName("vnfcList")
+    private List<VNFC> vnfcs = new ArrayList<>();
+    @Expose
+    @SerializedName("networkList")
+    private List<Network> networks = new ArrayList<>();
+
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+    public String getUuid() {
+        return uuid;
+    }
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+    public List<VFModule> getVfModules() {
+        return vfModules;
+    }
+    public void setVfModules(List<VFModule> vfModules) {
+        this.vfModules = vfModules;
+    }
+    public void addVfModule(VFModule vfModule) {
+        this.vfModules.add(vfModule);
+    }
+    public List<VNFC> getVnfcs() {
+        return vnfcs;
+    }
+    public void setVnfcs(List<VNFC> vnfc) {
+        this.vnfcs = vnfc;
+    }
+    public void addVnfc(VNFC vnfc) {
+        this.vnfcs.add(vnfc);
+    }
+    public List<Attribute> getAttributes() {
+        return attributeList;
+    }
+    public void setAttributes(List<Attribute> attributeList) {
+        this.attributeList = attributeList;
+    }
+    public void addAttribute(Attribute attribute) {
+        this.attributeList.add(attribute);
+    }
+    public DataQuality getDataQuality() {
+        return dataQuality;
+    }
+    public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; }
+    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<Network> getNetworks() {
+        return networks;
+    }
+
+    public void setNetworks(List<Network> networks) {
+        this.networks = networks;
+    }
+
+}
diff --git a/src/main/java/org/onap/pomba/common/datatypes/VNFC.java b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
index dd697d8..f05b1cf 100644
--- a/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
+++ b/src/main/java/org/onap/pomba/common/datatypes/VNFC.java
@@ -26,17 +26,17 @@ import java.util.List;
 public class VNFC {

 

     @Expose

+    @SerializedName("uuid")

+    private String uuid;

+    @Expose

     @SerializedName("name")

     private String name;

     @Expose

-    @SerializedName("invariantUUID")

-    private String invariantUuid;

+    @SerializedName("modelVersionID")

+    private String modelVersionID;

     @Expose

-    @SerializedName("uuid")

-    private String uuid;

-    @Expose

-    @SerializedName("type")

-    private String type;

+    @SerializedName("modelInvariantUUID")

+    private String modelInvariantUUID;

     @Expose

     @SerializedName("dataQuality")

     private DataQuality dataQuality = DataQuality.ok();

@@ -50,24 +50,12 @@ public class VNFC {
     public void setName(String name) {

         this.name = name;

     }

-    public String getInvariantUuid() {

-        return invariantUuid;

-    }

-    public void setInvariantUuid(String invariantUuid) {

-        this.invariantUuid = invariantUuid;

-    }

     public String getUuid() {

         return uuid;

     }

     public void setUuid(String uuid) {

         this.uuid = uuid;

     }

-    public String getType() {

-        return type;

-    }

-    public void setType(String type) {

-        this.type = type;

-    }

     public List<Attribute> getAttributes() {

         return attributeList;

     }

@@ -83,4 +71,19 @@ public class VNFC {
     public void setDataQuality(DataQuality dataQuality) {

         this.dataQuality = dataQuality;

     }

+    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;

+    }

+

 }

diff --git a/src/main/java/org/onap/pomba/common/resource/AuditResource.java b/src/main/java/org/onap/pomba/common/resource/AuditResource.java
new file mode 100644
index 0000000..03058ed
--- /dev/null
+++ b/src/main/java/org/onap/pomba/common/resource/AuditResource.java
@@ -0,0 +1,66 @@
+/*
+ * ============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.resource;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.ApiParam;
+import org.onap.pomba.common.datatypes.ModelContext;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+@Api
+@Path("/service")
+@Produces({MediaType.APPLICATION_JSON})
+public class AuditResource {
+
+
+    @GET
+    @Path("/context")
+    @Produces({ MediaType.APPLICATION_JSON })
+    @ApiOperation(
+            value = "Get Common model context from Context Builder",
+            response = ModelContext.class)
+    @ApiResponses(value = {
+            @ApiResponse(code = 404, message = "Service not available"),
+            @ApiResponse(code = 400, message = "Bad request"),
+            @ApiResponse(code = 401, message = "Unauthorized"),
+            @ApiResponse(code = 500, message = "Unexpected Runtime error") })
+
+    public  ModelContext getContext(
+            @ApiParam(value = "ID that identifies calling application", required = true) @HeaderParam("X-FromAppId") String xFromAppId,
+            @ApiParam(value = "Transaction ID published by the calling application", required = false) @HeaderParam("X-TransactionId") String xTransactionId,
+            @ApiParam(value = "Instance ID of the audited service", required = true) @QueryParam("serviceInstanceId") String serviceInstanceId,
+            @ApiParam(value = "Unique identifier of a SDC model version", required = false) @QueryParam("modelVersionId") String modelVersionId,
+            @ApiParam(value = "Global identifier of each SDC asset", required = false) @QueryParam("modelInvariantId") String modelInvariantId
+    )
+
+    {
+        return null;
+    }
+
+
+}