Add ability to apply configurations to vnf

Issue-ID: AAI-326
Change-Id: Id5480d020f66a6b8d83310d85eb0678f6b504e7a
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

8 files changed, 697 insertions, 10 deletions

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
index 8653420f..d98c6a0b 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -1,6 +1,50 @@
 {
 	"rules": [
 		{
+			"from": "configuration",
+			"to": "logical-link",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "configuration",
+			"to": "metadatum",
+			"label": "owns",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "configuration",
+			"to": "allotted-resource",
+			"label": "uses",
+			"direction": "OUT",
+			"multiplicity": "One2One",
+			"contains-other-v": "NONE",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
+			"from": "service-instance",
+			"to": "configuration",
+			"label": "has",
+			"direction": "OUT",
+			"multiplicity": "One2Many",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE"
+		},
+		{
 			"from": "availability-zone",
 			"to": "complex",
 			"label": "groupsResourcesIn",
@@ -1026,7 +1070,7 @@
 		{
 			"from": "platform",
 			"to": "generic-vnf",
-			"label": "Uses",
+			"label": "uses",
 			"direction": "OUT",
 			"multiplicity": "Many2Many",
 			"contains-other-v": "NONE",
@@ -1661,7 +1705,18 @@
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE"
 		},
-		{
+        {
+            "from": "generic-vnf",
+            "to": "configuration",
+            "label": "uses",
+            "direction": "OUT",
+            "multiplicity": "One2Many",
+            "contains-other-v": "NONE",
+            "delete-other-v": "${direction}",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE"
+        },
+      	{
 			"from": "vf-module",
 			"to": "volume-group",
 			"label": "uses",
diff --git a/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java b/aai-core/src/test/java/org/openecomp/aai/logging/CNNameTest.java
index f5b67233..b4705030 100644
--- a/aai-core/src/test/java/org/openecomp/aai/util/CNNameTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/logging/CNNameTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.aai.util;
+package org.openecomp.aai.logging;
 
 import ch.qos.logback.access.spi.IAccessEvent;
 import org.junit.Before;
@@ -26,6 +26,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.openecomp.aai.logging.CNName;
 import org.openecomp.aai.serialization.queryformats.QueryFormatTestHelper;
+import org.openecomp.aai.util.AAIConstants;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.agent.PowerMockAgent;
diff --git a/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java b/aai-core/src/test/java/org/openecomp/aai/logging/CustomLogPatternLayoutTest.java
index 31a7b5e4..3e79646b 100644
--- a/aai-core/src/test/java/org/openecomp/aai/util/CustomLogPatternLayoutTest.java
+++ b/aai-core/src/test/java/org/openecomp/aai/logging/CustomLogPatternLayoutTest.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.aai.util;
+package org.openecomp.aai.logging;
 
 import org.junit.Test;
 import org.openecomp.aai.logging.CNName;
diff --git a/aai-core/src/test/java/org/openecomp/aai/logging/DME2RestFlagTest.java b/aai-core/src/test/java/org/openecomp/aai/logging/DME2RestFlagTest.java
new file mode 100644
index 00000000..b20f1328
--- /dev/null
+++ b/aai-core/src/test/java/org/openecomp/aai/logging/DME2RestFlagTest.java
@@ -0,0 +1,82 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.openecomp.aai.logging;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import ch.qos.logback.access.spi.IAccessEvent;
+import org.junit.*;
+
+
+public class DME2RestFlagTest {
+
+    IAccessEvent mockAccEvent;
+    DME2RestFlag _DME2RestFlag;
+
+    String[] temp = new String[4];
+
+
+    @Before
+    public void setUp() throws Exception {
+
+        mockAccEvent = mock(IAccessEvent.class);
+        _DME2RestFlag= spy(DME2RestFlag.class);
+
+    }
+    private DME2RestFlag getTestObj(final boolean instanceStarted){
+        return new DME2RestFlag(){
+            @Override
+            public
+            boolean isStarted(){
+                return instanceStarted;
+            }
+        };
+    }
+
+    @Test
+    public void convertTestAllValid(){
+        temp[0]= "temp1";
+        temp[1] = "-";
+        when(mockAccEvent.getRequestParameter("envContext")).thenReturn(temp);
+        when(mockAccEvent.getRequestParameter("routeOffer")).thenReturn(temp);
+        when(mockAccEvent.getRequestParameter("version")).thenReturn(temp);
+        _DME2RestFlag = getTestObj(true);
+        assertEquals(_DME2RestFlag.convert(mockAccEvent),"DME2");
+    }
+
+    @Test
+    public void convertMissingRouteTest(){
+        temp[0]= "";
+        temp[1] = "-";
+        when(mockAccEvent.getRequestParameter("envContext")).thenReturn(temp);
+        when(mockAccEvent.getRequestParameter("routeOffer")).thenReturn(temp);
+        when(mockAccEvent.getRequestParameter("version")).thenReturn(temp);
+        _DME2RestFlag = getTestObj(true);
+        assertEquals(_DME2RestFlag.convert(mockAccEvent),"REST");
+    }
+
+    @Test
+    public void convertIsStartedFalseTest(){
+        _DME2RestFlag = getTestObj(false);
+        assertEquals(_DME2RestFlag.convert(mockAccEvent),"INACTIVE_HEADER_CONV");
+    }
+
+
+}
diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
index 291bc6b3..2d22cbb3 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v11.xsd
@@ -7201,6 +7201,115 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="configuration">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Port Mirror Configuration.",indexedProps="configuration-id,model-invariant-id,model-version-id",uniqueProps="configuration-id",container="configurations",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="management-option" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="configuration-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="configuration-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Name of the configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="configuration-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="port-mirroring-configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="configuration-sub-type" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="vprobe, pprobe.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="orchestration-status" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Orchestration status of the configuration.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-status" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Indicator for whether the resource is considered operational.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="configuration-selflink" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details from SDN-GC.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-customization-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="id of  the configuration used to customize the resource")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.openecomp.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:metadata" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="configurations">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.openecomp.aai.annotations.Metadata(description="Collection of configurations")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:configuration" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="notification-event-header">
     <xs:complexType>
       <xs:sequence>
diff --git a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
index f30983e9..dc95e4bf 100644
--- a/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
+++ b/aai-schema/src/main/resources/aai_swagger_html/aai_swagger_v11.html
@@ -146074,6 +146074,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 <li>TO tunnel-xconnect (comprises allotted-resource, One2One)</li>
 <li>TO vpn-binding (Many2Many)</li>
 <li>TO allotted-resource (One2One)</li>
+<li>FROM configuration</li>
 <li>FROM service-instance (is composed of allotted-resource)</li>
 <li>FROM service-instance</li>
 <li>FROM allotted-resource</li></ul>
@@ -147651,6 +147652,266 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                 </section>
                     </div>
                 </div>
+                <div id="definition-configuration" class="panel panel-definition">
+                        <div class="panel-heading">
+                                <h3 class="panel-title"><a name="/definitions/configuration"></a>configuration:
+                                    <span class="json-property-type"><span class="json-property-type">object</span>
+                <span class="json-property-range" title="Value limits"></span>
+                
+                </span>
+                                </h3>
+                        </div>
+                    <div class="panel-body">
+                    			<section class="json-schema-description">
+                                    <p>Port Mirror Configuration.</p>
+<h6 id="related-nodes">Related Nodes</h6>
+<ul>
+<li>TO logical-link (One2Many)</li>
+<li>TO metadatum (comprises configuration, One2Many)</li>
+<li>TO allotted-resource (One2One)</li>
+<li>FROM service-instance</li>
+<li>FROM generic-vnf</li></ul>
+                            
+                                </section>
+
+                                <section class="json-schema-properties">
+                                    <dl>
+                                            <dt data-property-name="management-option">
+                                                <span class="json-property-name">management-option:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="configuration-id">
+                                                <span class="json-property-name">configuration-id:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>UUID assigned to configuration.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="configuration-name">
+                                                <span class="json-property-name">configuration-name:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>Name of the configuration.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="configuration-type">
+                                                <span class="json-property-name">configuration-type:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>port-mirroring-configuration.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="configuration-sub-type">
+                                                <span class="json-property-name">configuration-sub-type:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>vprobe, pprobe.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="model-invariant-id">
+                                                <span class="json-property-name">model-invariant-id:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>the ASDC model id for this resource or service model.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="model-version-id">
+                                                <span class="json-property-name">model-version-id:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>the ASDC model version for this resource or service model.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="orchestration-status">
+                                                <span class="json-property-name">orchestration-status:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>Orchestration status of the configuration.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="operational-status">
+                                                <span class="json-property-name">operational-status:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>Indicator for whether the resource is considered operational.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="configuration-selflink">
+                                                <span class="json-property-name">configuration-selflink:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>URL to endpoint where AAI can get more details from SDN-GC.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="model-customization-id">
+                                                <span class="json-property-name">model-customization-id:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                                 <span class="json-property-required"></span>
+                                            </dt>
+                                            <dd>
+                                                <p>id of  the configuration used to customize the resource</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="resource-version">
+                                                <span class="json-property-name">resource-version:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>Used for optimistic concurrency.  Must be empty on create, valid on update and delete.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
+                                            <dt data-property-name="relationship-list">
+                                                <span class="json-property-name">relationship-list:</span>
+                                                <span class="json-property-type">object</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                
+                                                <div class="json-inner-schema">
+                                                    
+                                                                    <section class="json-schema-array-items">
+                                                                        <span class="json-property-type">    <a class="json-schema-ref" href="#/definitions/relationship-list">relationship-list</a>
+                                                                        </span>
+                                                                        <span class="json-property-range" title="Value limits"></span>
+                                                                        
+                                                                        <div class="json-inner-schema">
+                                                                            
+                                                                        </div>
+                                                                    </section>                </div>
+                                            </dd>
+                                            <dt data-property-name="metadata">
+                                                <span class="json-property-name">metadata:</span>
+                                                <span class="json-property-type">object</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                
+                                                <div class="json-inner-schema">
+                                                    
+                                                                    <section class="json-schema-array-items">
+                                                                        <span class="json-property-type">    <a class="json-schema-ref" href="#/definitions/metadata">metadata</a>
+                                                                        </span>
+                                                                        <span class="json-property-range" title="Value limits"></span>
+                                                                        
+                                                                        <div class="json-inner-schema">
+                                                                            
+                                                                        </div>
+                                                                    </section>                </div>
+                                            </dd>
+                                    </dl>
+                                </section>
+                    </div>
+                </div>
+                <div id="definition-configurations" class="panel panel-definition">
+                        <div class="panel-heading">
+                                <h3 class="panel-title"><a name="/definitions/configurations"></a>configurations:
+                                    <span class="json-property-type"><span class="json-property-type">object</span>
+                <span class="json-property-range" title="Value limits"></span>
+                
+                </span>
+                                </h3>
+                        </div>
+                    <div class="panel-body">
+                    			<section class="json-schema-description">
+                                    <p>Collection of configurations</p>
+                            
+                                </section>
+
+                                <section class="json-schema-properties">
+                                    <dl>
+                                            <dt data-property-name="configuration">
+                                                <span class="json-property-name">configuration:</span>
+                                                <span class="json-property-type">object[]</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                
+                                                <div class="json-inner-schema">
+                                                    
+                                                                    <section class="json-schema-array-items">
+                                                                        <span class="json-property-type">    <a class="json-schema-ref" href="#/definitions/configuration">configuration</a>
+                                                                        </span>
+                                                                        <span class="json-property-range" title="Value limits"></span>
+                                                                        
+                                                                        <div class="json-inner-schema">
+                                                                            
+                                                                        </div>
+                                                                    </section>                </div>
+                                            </dd>
+                                    </dl>
+                                </section>
+                    </div>
+                </div>
                 <div id="definition-connector" class="panel panel-definition">
                         <div class="panel-heading">
                                 <h3 class="panel-title"><a name="/definitions/connector"></a>connector:
@@ -150310,6 +150571,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 <li>TO network-profile (Many2Many)</li>
 <li>TO pnf (Many2Many)</li>
 <li>TO ipsec-configuration (Many2One)</li>
+<li>TO configuration (One2Many)</li>
 <li>TO vf-module (comprises generic-vnf, One2Many)</li>
 <li>TO volume-group (One2Many)</li>
 <li>TO vnfc (One2Many)</li>
@@ -154469,6 +154731,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
 <li>TO pserver (Many2Many)</li>
 <li>TO cloud-region (Many2Many)</li>
 <li>TO vpn-binding (Many2Many)</li>
+<li>FROM configuration</li>
 <li>FROM l-interface</li>
 <li>FROM lag-interface</li>
 <li>FROM p-interface</li>
@@ -154843,6 +155106,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                     <p>Key/value pairs</p>
 <h6 id="related-nodes">Related Nodes</h6>
 <ul>
+<li>FROM configuration (is composed of metadatum)</li>
 <li>FROM image (is composed of metadatum)</li>
 <li>FROM model-ver (is composed of metadatum)</li>
 <li>FROM service-instance (is composed of metadatum)</li>
@@ -157953,6 +158217,18 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                                     
                                                 </div>
                                             </dd>
+                                            <dt data-property-name="mac-addresss">
+                                                <span class="json-property-name">mac-addresss:</span>
+                                                <span class="json-property-type">string</span>
+                                                <span class="json-property-range" title="Value limits"></span>
+                                                
+                                            </dt>
+                                            <dd>
+                                                <p>MAC Address of the p-interface.</p>
+                                                <div class="json-inner-schema">
+                                                    
+                                                </div>
+                                            </dd>
                                             <dt data-property-name="resource-version">
                                                 <span class="json-property-name">resource-version:</span>
                                                 <span class="json-property-type">string</span>
@@ -161569,6 +161845,7 @@ This document is best viewed with Firefox or Chrome. Nodes can be found by appen
                                     <p>Instance of a service</p>
 <h6 id="related-nodes">Related Nodes</h6>
 <ul>
+<li>TO configuration (One2Many)</li>
 <li>TO zone (Many2One)</li>
 <li>TO cvlan-tag (Many2Many)</li>
 <li>TO pnf (One2Many)</li>
diff --git a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
index ca381c03..3f250f64 100644
--- a/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
+++ b/aai-schema/src/main/resources/aai_swagger_yaml/aai_swagger_v11.yaml
@@ -42283,6 +42283,7 @@ definitions:
     description: |
       Key/value pairs
       ###### Related Nodes
+      - FROM configuration (is composed of metadatum)
       - FROM image (is composed of metadatum)
       - FROM model-ver (is composed of metadatum)
       - FROM service-instance (is composed of metadatum)
@@ -43253,6 +43254,7 @@ definitions:
       - TO tunnel-xconnect (comprises allotted-resource, One2One)
       - TO vpn-binding (Many2Many)
       - TO allotted-resource (One2One)
+      - FROM configuration
       - FROM service-instance (is composed of allotted-resource)
       - FROM service-instance
       - FROM allotted-resource
@@ -43312,6 +43314,7 @@ definitions:
     description: |
       Instance of a service
       ###### Related Nodes
+      - TO configuration (One2Many)
       - TO zone (Many2One)
       - TO cvlan-tag (Many2Many)
       - TO pnf (One2Many)
@@ -44138,6 +44141,7 @@ definitions:
       - TO pserver (Many2Many)
       - TO cloud-region (Many2Many)
       - TO vpn-binding (Many2Many)
+      - FROM configuration
       - FROM l-interface
       - FROM lag-interface
       - FROM p-interface
@@ -45231,6 +45235,7 @@ definitions:
       - TO network-profile (Many2Many)
       - TO pnf (Many2Many)
       - TO ipsec-configuration (Many2One)
+      - TO configuration (One2Many)
       - TO vf-module (comprises generic-vnf, One2Many)
       - TO volume-group (One2Many)
       - TO vnfc (One2Many)
@@ -46294,6 +46299,74 @@ definitions:
         type: string
       key-value:
         type: string
+  configurations:
+    description: |
+      Collection of configurations
+    properties:
+      configuration:
+        type: array
+        items:          
+          $ref: "#/definitions/configuration"
+  configuration:
+    description: |
+      Port Mirror Configuration.
+      ###### Related Nodes
+      - TO logical-link (One2Many)
+      - TO metadatum (comprises configuration, One2Many)
+      - TO allotted-resource (One2One)
+      - FROM service-instance
+      - FROM generic-vnf
+    required:
+    - configuration-id
+    - configuration-type
+    - configuration-sub-type
+    - orchestration-status
+    - operational-status
+    - configuration-selflink
+    - model-customization-id
+    properties:
+      management-option:
+        type: string
+        description: Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.
+      configuration-id:
+        type: string
+        description: UUID assigned to configuration.
+      configuration-name:
+        type: string
+        description: Name of the configuration.
+      configuration-type:
+        type: string
+        description: port-mirroring-configuration.
+      configuration-sub-type:
+        type: string
+        description: vprobe, pprobe.
+      model-invariant-id:
+        type: string
+        description: the ASDC model id for this resource or service model.
+      model-version-id:
+        type: string
+        description: the ASDC model version for this resource or service model.
+      orchestration-status:
+        type: string
+        description: Orchestration status of the configuration.
+      operational-status:
+        type: string
+        description: Indicator for whether the resource is considered operational.
+      configuration-selflink:
+        type: string
+        description: URL to endpoint where AAI can get more details from SDN-GC.
+      model-customization-id:
+        type: string
+        description: id of  the configuration used to customize the resource
+      resource-version:
+        type: string
+        description: Used for optimistic concurrency.  Must be empty on create, valid on update and delete.
+      relationship-list:
+        type: object
+        $ref: "#/definitions/relationship-list"
+      metadata:
+        type: object
+        $ref: "#/definitions/metadata"
   notification-event:
     properties:
       cambria.partition:
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index b9bf2970..e0b11589 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@ -2395,7 +2395,7 @@
 				<xml-property name="namespace" value="business" />
 			</xml-properties>
 		</java-type>
-		
+
 		<java-type name="LinesOfBusiness">
 			<xml-properties>
 				<xml-property name="description" value="Collection of lines-of-business" />
@@ -2405,7 +2405,7 @@
 				<xml-element container-type="java.util.ArrayList" java-attribute="lineOfBusiness" name="line-of-business" type="inventory.aai.onap.org.v11.LineOfBusiness" />
 			</java-attributes>
 		</java-type>
-		
+
 		<java-type name="LineOfBusiness">
 			<xml-root-element name="line-of-business" />
 			<java-attributes>
@@ -2429,7 +2429,7 @@
 				<xml-property name="namespace" value="business" />
 			</xml-properties>
 		</java-type>
-		
+
 		<java-type name="OwningEntities">
 			<xml-properties>
 				<xml-property name="description" value="Collection of owning-entities" />
@@ -2469,7 +2469,7 @@
 				<xml-property name="namespace" value="business" />
 			</xml-properties>
 		</java-type>
-		
+
 		<java-type name="Platforms">
 			<xml-properties>
 				<xml-property name="description" value="Collection of platforms" />
@@ -2479,7 +2479,7 @@
 				<xml-element container-type="java.util.ArrayList" java-attribute="platform" name="platform" type="inventory.aai.onap.org.v11.Platform" />
 			</java-attributes>
 		</java-type>
-		
+
 		<java-type name="Platform">
 			<xml-root-element name="platform" />
 			<java-attributes>
@@ -2503,7 +2503,7 @@
 				<xml-property name="namespace" value="business" />
 			</xml-properties>
 		</java-type>
-		
+
 		<java-type name="ServiceSubscriptions">
 			<xml-properties>
 				<xml-property name="description" value="Collection of objects that group service instances." />
@@ -2868,6 +2868,96 @@
 				<xml-element java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v11.VipIpv6AddressList" />
 			</java-attributes>
 		</java-type>
+        <java-type name="Configurations">
+			<xml-properties>
+				<xml-property name="description" value="Collection of configurations" />
+			</xml-properties>
+			<xml-root-element name="configurations" />
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="configuration" name="configurations" type="inventory.aai.onap.org.v11.Configuration" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="Configuration">
+			<xml-root-element name="configuration" />
+			<java-attributes>
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="UUID assigned to configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Name of the configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationType" name="configuration-type" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="port-mirroring-configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationSubType" name="configuration-sub-type" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="vprobe, pprobe." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="orchestrationStatus" name="orchestration-status" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Orchestration status of the configuration." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Indicator for whether the resource is considered operational." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="configurationSelflink" name="configuration-selflink" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details from SDN-GC." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" required="true" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="id of  the configuration used to customize the resource" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
+				<xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v11.Metadata" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Port Mirror Configuration." />
+				<xml-property name="indexedProps" value="configuration-id,model-invariant-id,model-version-id" />
+				<xml-property name="uniqueProps" value="configuration-id" />
+				<xml-property name="container" value="configurations" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
 
 		<java-type name="LogicalLinks">
 			<xml-properties>