Merge "AT&T 1712 and 1802 release code"

3 files changed, 80 insertions, 30 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
index a8b5fcc945..e743dc754e 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
+++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	<!--
-		============LICENSE_START=======================================================
-		ONAP - SO
-		================================================================================
-		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=========================================================
+		=========================================================================
+		AT&T Proprietary (Internal Use Only) Not for use or disclosure outside
+		the AT&T companies except under written agreement (c) 2015 AT&T
+		Intellectual Property. All rights reserved. AT&T and the AT&T logo are
+		trademarks of AT&T Intellectual Property.
+		=======================================================================
 	-->
 	<!--
 		================================================================
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
index dcf52e30e5..ce92a4909b 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
+++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MsoServiceRequestTypesV1.xsd
@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		============LICENSE_START=======================================================
-		ONAP - SO
-		================================================================================
-		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=========================================================
+		=========================================================================
+		AT&T Proprietary (Internal Use Only) Not for use or disclosure outside
+		the AT&T companies except under written agreement (c) 2015 AT&T
+		Intellectual Property. All rights reserved. AT&T and the AT&T logo are
+		trademarks of AT&T Intellectual Property.
+		=======================================================================
 	-->
 <!--
 		================================================================
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd
new file mode 100644
index 0000000000..456ae1e9a7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd
@@ -0,0 +1,68 @@
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://org.openecomp/mso/workflow/schema/v1" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
+  <xs:element name="request-id" type="xs:string"/>
+  <xs:element name="source" type="xs:string"/>
+  <xs:element name="notification-url" type="xs:string"/>
+  <xs:element name="order-number" type="xs:string"/>
+  <xs:element name="order-version" type="xs:string"/>
+  <xs:element name="request-action" type="xs:string"/>
+  <xs:element name="model-invariant-uuid" type="xs:string"/>
+  <xs:element name="model-uuid" type="xs:string"/>
+  <xs:element name="model-version" type="xs:string"/>
+  <xs:element name="model-name" type="xs:string"/>
+  <xs:element name="service-id" type="xs:string"/>
+  <xs:element name="subscription-service-type" type="xs:string"/>
+  <xs:element name="ecomp-model-information">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="v1:model-invariant-uuid" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:model-uuid" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:model-version" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:model-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service-instance-id" type="xs:string"/>
+  <xs:element name="subscriber-name" type="xs:string"/>
+  <xs:element name="global-customer-id" type="xs:string"/>
+  <xs:element name="service-instance-name" type="xs:string"/>
+  <xs:element name="request-information">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="v1:request-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:source" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:notification-url" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:order-number" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:order-version" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:request-action" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service-information">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="v1:service-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:subscription-service-type" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:ecomp-model-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:service-instance-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:subscriber-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:global-customer-id" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="service-request-input">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="v1:service-instance-name" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="SDNCServiceInstanceRequestData">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="v1:request-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:service-information" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+        <xs:element ref="v1:service-request-input" xmlns:v1="http://org.openecomp/mso/workflow/schema/v1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file