Merge "Update the logs folder to be AAI-SS"
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
index 37350f0..d557026 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
@@ -8054,7 +8054,7 @@
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="A zone is a grouping of assets in a location homing to the same connections into the CBB",nameProps="zone-name",indexedProps="zone-id,design-type,zone-context",uniqueProps="zone-id",container="zones",namespace="network",uriTemplate="/network/zones/zone/{zone-id}",requiredProps="zone-id,zone-name,design-type,zone-context,in-maint")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -8100,6 +8100,13 @@
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="in-maint" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="Used to indicate whether or not zone object is in maintenance mode.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element ref="tns:relationship-list" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index 2eed800..f7e762c 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -2609,7 +2609,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
- "multiplicity": "ONE2ONE",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index 1f6829c..2d448aa 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -2622,7 +2622,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
- "multiplicity": "ONE2ONE",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
index 1f6829c..2d448aa 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
@@ -2622,7 +2622,7 @@
"to": "l3-network",
"label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
- "multiplicity": "ONE2ONE",
+ "multiplicity": "MANY2MANY",
"contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
index f36226e..aaf9e5c 100644
--- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml
@@ -6849,6 +6849,12 @@
<xml-property name="description" value="Concurrency value"/>
</xml-properties>
</xml-element>
+ <xml-element default-value="false" java-attribute="inMaint" name="in-maint" required="true" type="java.lang.Boolean">
+ <xml-properties>
+ <xml-property name="defaultValue" value="false"/>
+ <xml-property name="description" value="Used to indicate whether or not zone object is in maintenance mode."/>
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/>
</java-attributes>
<xml-properties>
@@ -6859,7 +6865,7 @@
<xml-property name="container" value="zones"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/zones/zone/{zone-id}"/>
- <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context"/>
+ <xml-property name="requiredProps" value="zone-id,zone-name,design-type,zone-context,in-maint"/>
</xml-properties>
</java-type>
<java-type name="RouteTargets">