I submitted update r108 that includes the updates contained in the two attached slide packages that we went over last week. For the attached notification package. please start reading @ slide 14. John Begin forwarded message:
From: ogf-nsi-project@googlecode.com Subject: [ogf-nsi-project] r108 committed - Submitting changes not yet commited. Date: 4 December, 2013 10:07:40 AM EST To: john.macauley@surfnet.nl
Revision: 108 Author: jmacauley Date: Wed Dec 4 15:07:03 2013 UTC Log: Submitting changes not yet commited. http://code.google.com/p/ogf-nsi-project/source/detail?r=108
Modified: /trunk/ConnectionService/a-gole-sd.xml /trunk/ConnectionService/ogf_nsi_connection_types_v2_0.xsd /trunk/ConnectionService/ogf_nsi_framework_headers_v2_0.xsd /trunk/ConnectionService/ogf_nsi_services_definition_v2_0.xsd /trunk/ConnectionService/ogf_nsi_services_p2p_v2_0.xsd /trunk/ConnectionService/ogf_nsi_services_types_v2_0.xsd
======================================= --- /trunk/ConnectionService/a-gole-sd.xml Tue Sep 17 07:59:19 2013 UTC +++ /trunk/ConnectionService/a-gole-sd.xml Wed Dec 4 15:07:03 2013 UTC @@ -42,171 +42,172 @@ --> <schema name="evts" required="true" namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://schemas.ogf.org/nsi/2013/07/services/point2point}EthernetVlanType"/> - - <!-- Parameter definitions for the service and their values. These reflect - the XML schema definitions and any local range restrictions. The - associated service XML schema is the definitive source for and type - and range definitions. If a parameter of the service is not contained - in this service descrption then it is not supported for this profile. + type="{http://schemas.ogf.org/nsi/2013/07/services/point2point}EthernetVlanType">
- Attributes: - - name - The name of the parameter within the XML schema for the - service. - - units - (Optinal) The unit of measurement for this parameter. - - required - Indicates if the parameter is mandatory or optional. - - modifiable - Can this parameter be modified after the initial - reservation has been created. There are four values for modifiable: - false - parameter cannot be modified. - true - parameter can be modified and there are no restrictions. - pre - parameter can only be modified before schedule start time. - post - parameter can only be modified after schedule start time. - - namespace - The qualified namesapce of the XML schema defining the - parameter. - - type - The fully qualified XML schema type of the parameter. - - Elements: - - comment - Descriptive text describing the parameter. - - minInclusive, maxInclusive - Allows the specification of parameter - ranges. - - increment - Allows for the specification of parameter value increments. - - default - The default for the parameter if a value is not specified. - This must not conflict with any default specified in the XML schema - definition for the parameter. - --> - <parameter name="capacity" units="Mbps" required="true" modifiable="true" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}int"> - <comment> - Capacity is defined to be the average quantity of data that will be - guaranteed to be transported per unit time from ingress to egress, - normalized to 1 second. The "capacity" for the EVTS instance - includes the ethernet frame header(s) but does not include sync - bits or any inter-frame gap considerations. Further, the EVTS - "capacity" attribute does not include any additional headers that - may be applied in transit. - </comment> - <minInclusive>0</minInclusive> - <maxInclusive>100000</maxInclusive> - <increment>1</increment> - </parameter> - - <!-- The service XML schema should fully define enumerated types, their - defaults, and optionality. This is here for informational purposes. --> - <parameter name="directionality" required="false" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://schemas.ogf.org/nsi/2013/07/services/types}DirectionalityType"> - <comment> - Directionality specifies whether the Connect requested is to be a - "unidirectional" or "bidirectional" circuit. The implications for - unidirectional are fairly obvious. However for bidirectional - connections the STPs must be defined as bi-directional. Note: - there may be ambiguity in certain topological scenarios where the - routing of the connection may not be clear. - </comment> - <default>Bidirectional</default> - </parameter> - - <!-- The service XML schema should fully define boolean types, their - defaults, and optionality. The only value for this being here is - informational and to indicate if the parameter can be modified. --> - <parameter name="symmetricPath" required="false" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}boolean"> - <comment> - An indication that both directions of a bidirectional circuit must - follow the same path. Only applicable when directionality is - "Bidirectional". If not specified then value is assumed to be false. - </comment> - <default>false</default> - </parameter> - - <!-- This is here for informational purposes. The only value for this being - here is informational and to indicate if the parameter can be modified. - --> - <parameter name="sourceSTP" required="true" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpType"> - <comment> - Source STP of the service. - </comment> - </parameter> - - <parameter name="destSTP" required="true" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpType"> - <comment> - Destination STP of the service. - </comment> - </parameter> - - <parameter name="ero" required="false" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpListType"> - <comment> - Hop-by-hop ordered list of STP from sourceSTP to destSTP. List does not include - sourceSTP and destSTP. - </comment> - </parameter> - - <parameter name="mtu" units="bytes" required="false" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}int"> - <comment> Specifies the maximum transmission unit size in bytes. </comment> - <minInclusive>1500</minInclusive> - <maxInclusive>9000</maxInclusive> - <increment>1</increment> - <default>9000</default> - </parameter> - - <parameter name="burstsize" units="bytes" required="false" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}int"> - <comment> - Burstsize describes the maximum amount of data that the ingress STP - will accept in a single sequence of packets at line rate of that - STP. Bursts must be separated by a long enough quiescent period for - the average long term rate of data transfer is within the capacity - limits. Packets exceeding this burst profile are policed and will - be immediately dropped when detected. - </comment> - <minInclusive>0</minInclusive> - <maxInclusive>100000000000</maxInclusive> - <increment>1</increment> - </parameter> + <!-- Parameter definitions for the service and their values. These reflect + the XML schema definitions and any local range restrictions. The + associated service XML schema is the definitive source for and type + and range definitions. If a parameter of the service is not contained + in this service descrption then it is not supported for this profile. + + Attributes: + + name - The name of the parameter within the XML schema for the + service. + + units - (Optinal) The unit of measurement for this parameter. + + required - Indicates if the parameter is mandatory or optional. + + modifiable - Can this parameter be modified after the initial + reservation has been created. There are four values for modifiable: + false - parameter cannot be modified. + true - parameter can be modified and there are no restrictions. + pre - parameter can only be modified before schedule start time. + post - parameter can only be modified after schedule start time. + + namespace - The qualified namesapce of the XML schema defining the + parameter. + + type - The fully qualified XML schema type of the parameter. + + Elements: + + comment - Descriptive text describing the parameter. + + minInclusive, maxInclusive - Allows the specification of parameter + ranges. + + increment - Allows for the specification of parameter value increments. + + default - The default for the parameter if a value is not specified. + This must not conflict with any default specified in the XML schema + definition for the parameter. + --> + <parameter name="capacity" units="Mbps" required="true" modifiable="true" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}int"> + <comment> + Capacity is defined to be the average quantity of data that will be + guaranteed to be transported per unit time from ingress to egress, + normalized to 1 second. The "capacity" for the EVTS instance + includes the ethernet frame header(s) but does not include sync + bits or any inter-frame gap considerations. Further, the EVTS + "capacity" attribute does not include any additional headers that + may be applied in transit. + </comment> + <minInclusive>0</minInclusive> + <maxInclusive>100000</maxInclusive> + <increment>1</increment> + </parameter> + + <!-- The service XML schema should fully define enumerated types, their + defaults, and optionality. This is here for informational purposes. --> + <parameter name="directionality" required="false" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://schemas.ogf.org/nsi/2013/07/services/types}DirectionalityType"> + <comment> + Directionality specifies whether the Connect requested is to be a + "unidirectional" or "bidirectional" circuit. The implications for + unidirectional are fairly obvious. However for bidirectional + connections the STPs must be defined as bi-directional. Note: + there may be ambiguity in certain topological scenarios where the + routing of the connection may not be clear. + </comment> + <default>Bidirectional</default> + </parameter> + + <!-- The service XML schema should fully define boolean types, their + defaults, and optionality. The only value for this being here is + informational and to indicate if the parameter can be modified. --> + <parameter name="symmetricPath" required="false" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}boolean"> + <comment> + An indication that both directions of a bidirectional circuit must + follow the same path. Only applicable when directionality is + "Bidirectional". If not specified then value is assumed to be false. + </comment> + <default>false</default> + </parameter> + + <!-- This is here for informational purposes. The only value for this being + here is informational and to indicate if the parameter can be modified. + --> + <parameter name="sourceSTP" required="true" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpType"> + <comment> + Source STP of the service. + </comment> + </parameter> + + <parameter name="destSTP" required="true" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpType"> + <comment> + Destination STP of the service. + </comment> + </parameter> + + <parameter name="ero" required="false" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://schemas.ogf.org/nsi/2013/07/services/types}StpListType"> + <comment> + Hop-by-hop ordered list of STP from sourceSTP to destSTP. List does not include + sourceSTP and destSTP. + </comment> + </parameter> + + <parameter name="mtu" units="bytes" required="false" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}int"> + <comment> Specifies the maximum transmission unit size in bytes. </comment> + <minInclusive>1500</minInclusive> + <maxInclusive>9000</maxInclusive> + <increment>1</increment> + <default>9000</default> + </parameter> + + <parameter name="burstsize" units="bytes" required="false" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}int"> + <comment> + Burstsize describes the maximum amount of data that the ingress STP + will accept in a single sequence of packets at line rate of that + STP. Bursts must be separated by a long enough quiescent period for + the average long term rate of data transfer is within the capacity + limits. Packets exceeding this burst profile are policed and will + be immediately dropped when detected. + </comment> + <minInclusive>0</minInclusive> + <maxInclusive>100000000000</maxInclusive> + <increment>1</increment> + </parameter> + + <parameter name="sourceVLAN" required="true" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}int"> + <comment> + The VLAN identifier must be in the range 1780 - 1783. + </comment> + <minInclusive>1780</minInclusive> + <maxInclusive>1783</maxInclusive> + <increment>1</increment> + </parameter> + + <parameter name="destVLAN" required="true" modifiable="false" + namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" + type="{http://www.w3.org/2001/XMLSchema}int"> + <comment> + The VLAN identifier must be in the range 1780 - 1783. + </comment> + <minInclusive>1780</minInclusive> + <maxInclusive>1783</maxInclusive> + <increment>1</increment> + </parameter> + </schema>
- <parameter name="sourceVLAN" required="true" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}int"> - <comment> - The VLAN identifier must be in the range 1780 - 1783. - </comment> - <minInclusive>1780</minInclusive> - <maxInclusive>1783</maxInclusive> - <increment>1</increment> - </parameter> - - <parameter name="destVLAN" required="true" modifiable="false" - namespace="http://schemas.ogf.org/nsi/2013/07/services/point2point" - type="{http://www.w3.org/2001/XMLSchema}int"> - <comment> - The VLAN identifier must be in the range 1780 - 1783. - </comment> - <minInclusive>1780</minInclusive> - <maxInclusive>1783</maxInclusive> - <increment>1</increment> - </parameter> - <!-- Framing describes the transport characteristics on the edge ports supporting the service. --> <attribute name="framing" type="IEEE 802.1Q Trunk"> ======================================= --- /trunk/ConnectionService/ogf_nsi_connection_types_v2_0.xsd Fri Sep 13 14:34:02 2013 UTC +++ /trunk/ConnectionService/ogf_nsi_connection_types_v2_0.xsd Wed Dec 4 15:07:03 2013 UTC @@ -73,12 +73,12 @@ information collected by recursively traversing the reservation tree.
- 11. QueryNotification - Mechanism for a requester NSA to query the + 11. queryNERF - Mechanism for a requester NSA to query the provider NSA for a set of notifications against a connectionId. The returned results will be a list of notifications for the specified connectionId.
- 12. QueryNotificationSync - Mechanism for a requester NSA to query the + 12. queryNERFSync - Mechanism for a requester NSA to query the provider NSA for a set of notifications against a connectionId. The returned results will be a list of notifications for the specified connectionId. This is a synchronous blocking operation. @@ -182,15 +182,15 @@ <xsd:element name="querySummarySyncConfirmed" type="tns:QuerySummaryConfirmedType" /> <xsd:element name="querySummarySyncFailed" type="tns:QueryFailedType" />
- <!-- ********** QuerySummary message elements ********** --> - <xsd:element name="queryNotification" type="tns:QueryNotificationType" /> - <xsd:element name="queryNotificationConfirmed" type="tns:QueryNotificationConfirmedType" /> - <xsd:element name="queryNotificationFailed" type="tns:QueryFailedType" /> + <!-- ********** QueryNERF message elements ********** --> + <xsd:element name="queryNERF" type="tns:queryNERFType" /> + <xsd:element name="queryNERFConfirmed" type="tns:queryNERFConfirmedType" /> + <xsd:element name="queryNERFFailed" type="tns:QueryFailedType" />
- <!-- ********** QuerySummarySync message elements ********** --> - <xsd:element name="queryNotificationSync" type="tns:QueryNotificationType" /> - <xsd:element name="queryNotificationSyncConfirmed" type="tns:QueryNotificationConfirmedType" /> - <xsd:element name="queryNotificationSyncFailed" type="tns:QueryFailedType" /> + <!-- ********** QueryNERFSync message elements ********** --> + <xsd:element name="queryNERFSync" type="tns:queryNERFType" /> + <xsd:element name="queryNERFSyncConfirmed" type="tns:queryNERFConfirmedType" /> + <xsd:element name="queryNERFSyncFailed" type="tns:QueryFailedType" />
<!-- ********** Error message elements ********** --> <xsd:element name="error" type="tns:GenericErrorType" /> @@ -398,46 +398,63 @@ </xsd:sequence> </xsd:complexType>
- <xsd:complexType name="QueryNotificationType"> + <xsd:complexType name="queryNERFType"> <xsd:annotation> <xsd:documentation xml:lang="en"> - Type definition for the QueryNotification message providing a + Type definition for the queryNERF message providing a mechanism for a Requester NSA to query a Provider NSA for a - set of notifications against a specific connectionId. + set of Notifications, Errors, Responses, and Failures (NERF) + against a specific connectionId.
- Elements compose a filter for specifying the notifications to + Elements compose a filter for specifying the NERF to return in response to the query operation. The filter query provides an inclusive range of notification identifiers based on connectionId.
Elements:
- connectionId - Notifications for this connectionId. + connectionId - Retrieve NERF for this connectionId.
- startNotificationId - The start of the range of notificationIds - to return. If not present then the query should start from - oldest notificationId available. + startId - The start of the range of NERF Ids to return. If not + present then the query should start from oldest NERF available.
- endNotificationId - The end of the range of notificationIds - to return. If not present then the query should end with - the newest notificationId available. + endId - The end of the range of NERF Ids to return. If not + present then the query should end with the newest NERF available. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="connectionId" type="ftypes:ConnectionIdType" /> - <xsd:element name="startNotificationId" type="xsd:int" minOccurs="0" /> - <xsd:element name="endNotificationId" type="xsd:int" minOccurs="0" /> + <xsd:element name="startNERFId" type="xsd:int" minOccurs="0" /> + <xsd:element name="endNERFId" type="xsd:int" minOccurs="0" /> </xsd:sequence> </xsd:complexType>
- <xsd:complexType name="QueryNotificationConfirmedType"> + <xsd:complexType name="queryNERFConfirmedType"> <xsd:annotation> <xsd:documentation xml:lang="en"> - A query notification confirmation containing a list of notification - messages matching the specified query criteria. + A queryNERF confirmation containing a list of NERF messages + matching the specified query criteria.
Elements:
+ reserveConfirmed - Reserve operation confirmation. + + reserveFailed - Reserve operation failure. + + reserveCommitConfirmed - Reserve commit operation confirmation. + + reserveCommitFailed - Reserve commit operation failure. + + reserveAbortConfirmed - Reserve abort operation confirmation. + + provisionConfirmed - Provision operation confirmation. + + releaseConfirmed - Release operation confirmation. + + terminateConfirmed - Terminate confirmation. + + error - Error response message. + errorEvent - Error event notification.
reserveTimeout - Reserve timeout notification. @@ -449,6 +466,7 @@ </xsd:annotation> <xsd:sequence> <xsd:choice minOccurs="0" maxOccurs="unbounded"> + <xsd:element name="response" type="tns:NERFResponseType" /> <xsd:element ref="tns:errorEvent" /> <xsd:element ref="tns:reserveTimeout" /> <xsd:element ref="tns:dataPlaneStateChange" /> @@ -457,6 +475,51 @@ </xsd:sequence> </xsd:complexType>
+ <xsd:complexType name="NERFResponseType"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + A queryNERF element containing a list of NERF messages + matching the specified query criteria. + + Elements: + + reserveConfirmed - Reserve operation confirmation. + + reserveFailed - Reserve operation failure. + + reserveCommitConfirmed - Reserve commit operation confirmation. + + reserveCommitFailed - Reserve commit operation failure. + + reserveAbortConfirmed - Reserve abort operation confirmation. + + provisionConfirmed - Provision operation confirmation. + + releaseConfirmed - Release operation confirmation. + + terminateConfirmed - Terminate confirmation. + + error - Error response message. + </xsd:documentation> + </xsd:annotation> + <xsd:sequence> + <xsd:element name="nerfId" type="tns:NERFIdType" /> + <xsd:element name="correlationId" type="ftypes:UuidType" /> + <xsd:element name="timeStamp" type="ftypes:DateTimeType" /> + <xsd:choice> + <xsd:element ref="tns:reserveConfirmed" /> + <xsd:element ref="tns:reserveFailed" /> + <xsd:element ref="tns:reserveCommitConfirmed" /> + <xsd:element ref="tns:reserveCommitFailed" /> + <xsd:element ref="tns:reserveAbortConfirmed" /> + <xsd:element ref="tns:provisionConfirmed" /> + <xsd:element ref="tns:releaseConfirmed" /> + <xsd:element ref="tns:terminateConfirmed" /> + <xsd:element ref="tns:error" /> + </xsd:choice> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="GenericRequestType"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -564,9 +627,9 @@ </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="connectionId" type="ftypes:ConnectionIdType" /> - <xsd:element name="notificationId" type="tns:NotificationIdType" /> - <xsd:element name="timeStamp" type="ftypes:DateTimeType" /> + <xsd:element name="connectionId" type="ftypes:ConnectionIdType" /> + <xsd:element name="nerfId" type="tns:NERFIdType" /> + <xsd:element name="timeStamp" type="ftypes:DateTimeType" /> </xsd:sequence> </xsd:complexType>
@@ -892,10 +955,10 @@
connectionStates - The reservation's overall connection states.
- notificationId - If present represents the notification identifier - of the most recent error notification against this reservation. - The notificationId can be used in the queryNotification operation - to retrieve the associated notification. + nerfId - If present represents the NERF identifier of the most + recent notification, error, response, or failure message against + this reservation. The nerfId can be used in the queryNERF + operation to retrieve the associated messages. </xsd:documentation> </xsd:annotation> <xsd:sequence> @@ -905,7 +968,7 @@ <xsd:element name="criteria" type="tns:QuerySummaryResultCriteriaType" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="requesterNSA" type="ftypes:NsaIdType" /> <xsd:element name="connectionStates" type="tns:ConnectionStatesType" /> - <xsd:element name="notificationId" type="tns:NotificationIdType" minOccurs="0" /> + <xsd:element name="nerfId" type="tns:NERFIdType" minOccurs="0" /> </xsd:sequence> </xsd:complexType>
@@ -1073,10 +1136,10 @@
connectionStates - The reservation's overall connection states.
- notificationId - If present represents the notification identifier - of the most recent error notification against this reservation. - The notificationId can be used in the queryNotification operation - to retrieve the associated notification. + nerfId - If present represents the NERF identifier of the most + recent notification, error, response, or failure message against + this reservation. The nerfId can be used in the queryNERF + operation to retrieve the associated messages. </xsd:documentation> </xsd:annotation> <xsd:sequence> @@ -1086,7 +1149,7 @@ <xsd:element name="criteria" type="tns:QueryRecursiveResultCriteriaType" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="requesterNSA" type="ftypes:NsaIdType" /> <xsd:element name="connectionStates" type="tns:ConnectionStatesType" /> - <xsd:element name="notificationId" type="tns:NotificationIdType" minOccurs="0" /> + <xsd:element name="nerfId" type="tns:NERFIdType" minOccurs="0" /> </xsd:sequence> </xsd:complexType>
@@ -1303,10 +1366,10 @@ <xsd:restriction base="xsd:anyURI" /> </xsd:simpleType>
- <xsd:simpleType name="NotificationIdType"> + <xsd:simpleType name="NERFIdType"> <xsd:annotation> <xsd:documentation xml:lang="en"> - A specific type for a notificationId that is unique in the context + A specific type for a NERF identifier that is unique in the context of a connectionId. </xsd:documentation> </xsd:annotation> ======================================= --- /trunk/ConnectionService/ogf_nsi_framework_headers_v2_0.xsd Fri Jul 26 15:21:12 2013 UTC +++ /trunk/ConnectionService/ogf_nsi_framework_headers_v2_0.xsd Wed Dec 4 15:07:03 2013 UTC @@ -16,11 +16,8 @@
Description: This is the ftypes schema for the reference web services implementation of the OGF NSI Connection Services Protocol v2.0. Comments and questions can be directed to the mailing list group mailing list (nsi-wg@ogf.org). --> -<xsd:schema targetNamespace="http://schemas.ogf.org/nsi/2013/07/framework/headers" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" - xmlns:ftypes="http://schemas.ogf.org/nsi/2013/07/framework/types" - xmlns:tns="http://schemas.ogf.org/nsi/2013/07/framework/headers"> +<xsd:schema targetNamespace="http://schemas.ogf.org/nsi/2013/07/framework/headers" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" + xmlns:ftypes="http://schemas.ogf.org/nsi/2013/07/framework/types" xmlns:tns="http://schemas.ogf.org/nsi/2013/07/framework/headers">
<xsd:annotation> <xsd:documentation xml:lang="en"> @@ -30,18 +27,16 @@
<!-- Import SAML attribute definitions for our security attributes. This is a local import of: http://docs.oasis-open.org/security/saml/v2.0/saml-schema-assertion-2.0.xsd --> - <xsd:import namespace="urn:oasis:names:tc:SAML:2.0:assertion" - schemaLocation="saml-schema-assertion-2.0.xsd"/> - + <xsd:import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/> + <!-- Import the common NSI framework ftypes. --> - <xsd:import namespace="http://schemas.ogf.org/nsi/2013/07/framework/types" - schemaLocation="ogf_nsi_framework_types_v2_0.xsd"/> + <xsd:import namespace="http://schemas.ogf.org/nsi/2013/07/framework/types" schemaLocation="ogf_nsi_framework_types_v2_0.xsd"/>
<!-- ****************************************************************** * NSI protocol header * ****************************************************************** --> - <xsd:element name="nsiHeader" type="tns:CommonHeaderType" /> - + <xsd:element name="nsiHeader" type="tns:CommonHeaderType"/> + <xsd:complexType name="CommonHeaderType"> <xsd:annotation> <xsd:documentation xml:lang="en"> @@ -112,14 +107,27 @@ </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="protocolVersion" type="xsd:string" /> - <xsd:element name="correlationId" type="ftypes:UuidType" /> - <xsd:element name="requesterNSA" type="ftypes:NsaIdType" /> - <xsd:element name="providerNSA" type="ftypes:NsaIdType" /> - <xsd:element name="replyTo" type="xsd:anyURI" minOccurs="0" /> - <xsd:element name="sessionSecurityAttr" type="saml:AttributeStatementType" minOccurs="0" /> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="protocolVersion" type="xsd:string"/> + <xsd:element name="correlationId" type="ftypes:UuidType"/> + <xsd:element name="requesterNSA" type="ftypes:NsaIdType"/> + <xsd:element name="providerNSA" type="ftypes:NsaIdType"/> + <xsd:element name="replyTo" type="xsd:anyURI" minOccurs="0"/> + <xsd:element name="sessionSecurityAttr" type="tns:SessionSecurityAttrType" minOccurs="0" maxOccurs="unbounded"/> + <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> - <xsd:anyAttribute namespace="##other" processContents="lax" /> + <xsd:anyAttribute namespace="##other" processContents="lax"/> + </xsd:complexType> + + <xsd:complexType name="SessionSecurityAttrType"> + <xsd:annotation> + <xsd:documentation xml:lang="en"> + </xsd:documentation> + </xsd:annotation> + <xsd:complexContent> + <xsd:extension base="saml:AttributeStatementType"> + <xsd:attribute name="type" type="xsd:string" use="optional"/> + <xsd:attribute name="name" type="xsd:string" use="optional"/> + </xsd:extension> + </xsd:complexContent> </xsd:complexType> </xsd:schema> ======================================= --- /trunk/ConnectionService/ogf_nsi_services_definition_v2_0.xsd Tue Sep 17 07:59:19 2013 UTC +++ /trunk/ConnectionService/ogf_nsi_services_definition_v2_0.xsd Wed Dec 4 15:07:03 2013 UTC @@ -76,7 +76,6 @@ <xsd:element name="comment" type="xsd:string" minOccurs="0" /> <xsd:element name="serviceType" type="xsd:string" /> <xsd:element name="schema" type="tns:SchemaType" minOccurs="1" maxOccurs="unbounded" /> - <xsd:element name="parameter" type="tns:ParameterType" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="attribute" type="tns:AttributeType" minOccurs="0" maxOccurs="unbounded" /> <xsd:element name="error" type="tns:ErrorType" minOccurs="0" maxOccurs="unbounded" /> <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> @@ -111,7 +110,8 @@ </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="comment" type="xsd:string" minOccurs="0" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" /> + <xsd:element name="parameter" type="tns:ParameterType" minOccurs="0" maxOccurs="unbounded" /> <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> ======================================= --- /trunk/ConnectionService/ogf_nsi_services_p2p_v2_0.xsd Fri Sep 13 14:34:02 2013 UTC +++ /trunk/ConnectionService/ogf_nsi_services_p2p_v2_0.xsd Wed Dec 4 15:07:03 2013 UTC @@ -40,28 +40,27 @@ </xsd:annotation> </xsd:element>
- <xsd:element name="ets" type="tns:EthernetBaseType"> + <!-- These are the modifiable parameters within this service. --> + <xsd:element name="capacity" type="xsd:long"> <xsd:annotation> <xsd:documentation xml:lang="en"> - This Ethernet Transport Service element is used to specify a - point-to-point Ethernet service request in the NSI CS protocol. + This element is defined for a modification of the capacity of + the service. The unit of capacity is specified in the Service + Definition associated with the requested service. </xsd:documentation> - </xsd:annotation> + </xsd:annotation> </xsd:element> - - <xsd:element name="evts" type="tns:EthernetVlanType"> + + <xsd:element name="parameter" type="types:TypeValueType"> <xsd:annotation> <xsd:documentation xml:lang="en"> - This Ethernet VLAN Transport Service element is used to specify - a point-to-point Ethernet VLAN service request in the NSI CS - protocol. + This element is defined for specifying modification to + non-specific parameters defined in the Service Definition but + not in the service specific schema. </xsd:documentation> </xsd:annotation> </xsd:element>
- <!-- These are the modifiable parameters within this service. --> - <xsd:element name="capacity" type="xsd:long" /> - <!-- Type definitions for services types. --> <xsd:complexType name="P2PServiceBaseType"> <xsd:annotation> @@ -72,7 +71,7 @@
Elements:
- capacity - Capacity of the service in Mb/s. + capacity - Capacity of the service.
directionality - The (uni or bi) directionality of the service.
@@ -88,6 +87,11 @@ ero - A hop-by-hop ordered list of STP from sourceSTP to destSTP representing a path that the connection must follow. This list does not include sourceSTP or destSTP. + + parameter - A flexible non-specific parameters definition + allowing for specification of parameters in the Service + Definition that are not defined directly in the service + specific schema. </xsd:documentation> </xsd:annotation> <xsd:sequence> @@ -97,107 +101,8 @@ <xsd:element name="sourceSTP" type="types:StpType" /> <xsd:element name="destSTP" type="types:StpType" /> <xsd:element name="ero" type="types:StpListType" minOccurs="0" /> + <xsd:element name="parameter" type="types:TypeValueType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> </xsd:sequence> </xsd:complexType> - - <xsd:complexType name="EthernetBaseType"> - <xsd:annotation> - <xsd:documentation xml:lang="en"> - Point-to-Point Ethernet service definition. - - Elements: - - capacity - Capacity of the service in Mb/s including ethernet - framing headers. - - directionality - The (uni or bi) directionality of the service. - - symmetricPath - An indication that both directions of a bidirectional - circuit must fallow the same path. Only applicable when - directionality is "Bidirectional". If not specified then value - is assumed to be false. - - sourceSTP - Source STP of the service. - - destSTP - Destination STP of the service. - - ero - Hop-by-hop ordered list of STP from sourceSTP to - destSTP. List does not include sourceSTP and destSTP. - - mtu - Specifies the maximum transmission unit size in bits. - - burstsize - Specifies the maximum number of bits that can be - send to the interface before the sender must wait before - sending again. - </xsd:documentation> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:P2PServiceBaseType"> - <xsd:sequence> - <xsd:element name="mtu" type="xsd:int" minOccurs="0" /> - <xsd:element name="burstsize" type="xsd:long" minOccurs="0" /> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:complexType name="EthernetVlanType"> - <xsd:annotation> - <xsd:documentation xml:lang="en"> - Point-to-Point Ethernet VLAN service definition. - - Elements: - - capacity - Capacity of the service in Mb/s including ethernet - framing headers. - - directionality - The (uni or bi) directionality of the service. - - symmetricPath - An indication that both directions of a bidirectional - circuit must fallow the same path. Only applicable when - directionality is "Bidirectional". If not specified then value - is assumed to be false. - - sourceSTP - Source STP of the service. - - destSTP - Destination STP of the service. - - ero - Hop-by-hop ordered list of STP from sourceSTP to - destSTP. List does not include sourceSTP and destSTP. - - mtu - Specifies the maximum transmission unit size in bits. - - burstsize - Specifies the maximum number of bits that can be - send to the interface before the sender must wait before - sending again. - - sourceVLAN - Specifies the VLAN identifier for the source port - (1 - 4095). - - destVLAN - Specifies the VLAN identifier for the destination port - (1 - 4095). - </xsd:documentation> - </xsd:annotation> - <xsd:complexContent> - <xsd:extension base="tns:EthernetBaseType"> - <xsd:sequence> - <xsd:element name="sourceVLAN" type="tns:vlanIdType" /> - <xsd:element name="destVLAN" type="tns:vlanIdType" /> - </xsd:sequence> - </xsd:extension> - </xsd:complexContent> - </xsd:complexType> - - <xsd:simpleType name="vlanIdType"> - <xsd:annotation> - <xsd:documentation xml:lang="en"> - A simple type modelling a VLAN identifier and restricting range - to between 1 - 4095. - </xsd:documentation> - </xsd:annotation> - <xsd:restriction base="xsd:int"> - <xsd:minInclusive value="1"/> - <xsd:maxInclusive value="4095"/> - </xsd:restriction> - </xsd:simpleType> </xsd:schema> ======================================= --- /trunk/ConnectionService/ogf_nsi_services_types_v2_0.xsd Mon Sep 9 18:21:29 2013 UTC +++ /trunk/ConnectionService/ogf_nsi_services_types_v2_0.xsd Wed Dec 4 15:07:03 2013 UTC @@ -61,14 +61,21 @@ localId - A locally unique identifier for the STP within the associated network.
- labels - Technology specific attributes associated with - the Service Termination Point. + labels - Technology specific attribute associated with the + Service Termination Point. + + labelGroup - Technology specific attributes associated with + the Service Termination Point. Used to specify a range of + values instead of the label that provides a specific value. </xsd:documentation> </xsd:annotation> <xsd:sequence> - <xsd:element name="networkId" type="xsd:string" /> - <xsd:element name="localId" type="xsd:string" /> - <xsd:element name="label" type="tns:LabelType" minOccurs="0" maxOccurs="unbounded" /> + <xsd:element name="networkId" type="xsd:string" /> + <xsd:element name="localId" type="xsd:string" /> + <xsd:choice minOccurs="0"> + <xsd:element name="label" type="tns:TypeValueType" /> + <xsd:element name="labelGroup" type="tns:TypeValueType" maxOccurs="unbounded" /> + </xsd:choice> </xsd:sequence> </xsd:complexType>
@@ -111,44 +118,20 @@ <xsd:attribute name="order" type="xsd:int" use="required" /> </xsd:complexType>
- <xsd:complexType name="LabelType"> + <xsd:complexType name="TypeValueType"> <xsd:annotation> <xsd:documentation xml:lang="en"> - Definition for a simple type and multi-value tuple. Includes - simple string type and value, as well as more advanced - extensions if needed. A namespace attribute is included to - provide context where needed. - - Elements: - value - A string value corresponding to type. - - any - Provides a flexible mechanism allowing additional elements - to be provided as an alternative, or in combination with value. - Use of this element field is beyond the current scope of this - NSI specification, but may be used in the future to extend the - existing protocol without requiring a schema change. + Definition for a simple type and value tuple.
Attributes: - type - A string representing the name of the type. - - namespace - An optional URL to qualify the name space of the - capability. - - anyAttribute - Provides a flexible mechanism allowing additional - attributes non-specified to be provided as needed for peer-to-peer - NSA communications. Use of this attribute field is beyond the - current scope of this NSI specification, but may be used in the - future to extend the existing protocol without requiring a schema - change. + type - A string representing the name of the type. </xsd:documentation> </xsd:annotation> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" nillable="true" minOccurs="0" maxOccurs="unbounded" /> - <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xsd:sequence> - <xsd:attribute name="type" type="xsd:string" use="optional" /> - <xsd:attribute name="namespace" type="xsd:anyURI" use="optional" /> - <xsd:anyAttribute namespace="##other" processContents="lax" /> + <xsd:simpleContent> + <xsd:extension base="xsd:string"> + <xsd:attribute name="type" type="xsd:string" use="required"/> + </xsd:extension> + </xsd:simpleContent> </xsd:complexType>
<xsd:simpleType name="DirectionalityType">