From eb813a05f72631e9157126d1d841cadfaef7a92f Mon Sep 17 00:00:00 2001 From: karthik-sethuraman Date: Wed, 26 Oct 2016 16:46:51 -0400 Subject: [PATCH 1/2] Bug fix #152 --- SWAGGER/TapiConnectivity.swagger | 53 +++++++++++++++------------ SWAGGER/TapiNotification.swagger | 55 ++++++++++++++++------------- SWAGGER/TapiPathComputation.swagger | 53 +++++++++++++++------------ SWAGGER/TapiTopology.swagger | 53 +++++++++++++++------------ SWAGGER/TapiVirtualNetwork.swagger | 53 +++++++++++++++------------ 5 files changed, 151 insertions(+), 116 deletions(-) diff --git a/SWAGGER/TapiConnectivity.swagger b/SWAGGER/TapiConnectivity.swagger index 1a4cbc53..8d2bb9a4 100644 --- a/SWAGGER/TapiConnectivity.swagger +++ b/SWAGGER/TapiConnectivity.swagger @@ -4171,30 +4171,37 @@ }, "ServiceEndPoint": { "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms.", - "properties": { - "_state": { - "description": "none", - "$ref": "#/definitions/LifecycleStatePac" - }, - "direction": { - "enum": [ - "BIDIRECTIONAL", - "SINK", - "SOURCE", - "UNDEFINED_OR_UNKNOWN" - ], - "type": "string", - "description": "none" + "allOf": [ + { + "$ref": "#/definitions/ResourceSpec" }, - "_layerProtocol": { - "items": { - "$ref": "#/definitions/LayerProtocol" - }, - "type": "array", - "description": "none", - "x-key": "localId" - } - } + { + "properties": { + "_state": { + "description": "none", + "$ref": "#/definitions/LifecycleStatePac" + }, + "direction": { + "enum": [ + "BIDIRECTIONAL", + "SINK", + "SOURCE", + "UNDEFINED_OR_UNKNOWN" + ], + "type": "string", + "description": "none" + }, + "_layerProtocol": { + "items": { + "$ref": "#/definitions/LayerProtocol" + }, + "type": "array", + "description": "none", + "x-key": "localId" + } + } + } + ] }, "LocalClass": { "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ", diff --git a/SWAGGER/TapiNotification.swagger b/SWAGGER/TapiNotification.swagger index 97c0c538..248a62ea 100644 --- a/SWAGGER/TapiNotification.swagger +++ b/SWAGGER/TapiNotification.swagger @@ -2611,31 +2611,38 @@ "description": "A scoped name-value triple, including old value and new value" }, "ServiceEndPoint": { - "properties": { - "_state": { - "$ref": "#/definitions/LifecycleStatePac", - "description": "none" - }, - "direction": { - "enum": [ - "BIDIRECTIONAL", - "SINK", - "SOURCE", - "UNDEFINED_OR_UNKNOWN" - ], - "type": "string", - "description": "none" + "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms.", + "allOf": [ + { + "$ref": "#/definitions/ResourceSpec" }, - "_layerProtocol": { - "type": "array", - "items": { - "$ref": "#/definitions/LayerProtocol" - }, - "x-key": "localId", - "description": "none" - } - }, - "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms." + { + "properties": { + "_state": { + "description": "none", + "$ref": "#/definitions/LifecycleStatePac" + }, + "direction": { + "enum": [ + "BIDIRECTIONAL", + "SINK", + "SOURCE", + "UNDEFINED_OR_UNKNOWN" + ], + "type": "string", + "description": "none" + }, + "_layerProtocol": { + "items": { + "$ref": "#/definitions/LayerProtocol" + }, + "type": "array", + "description": "none", + "x-key": "localId" + } + } + } + ] }, "NameAndValue": { "description": "A scoped name-value pair", diff --git a/SWAGGER/TapiPathComputation.swagger b/SWAGGER/TapiPathComputation.swagger index 803007b5..98e74e16 100644 --- a/SWAGGER/TapiPathComputation.swagger +++ b/SWAGGER/TapiPathComputation.swagger @@ -4543,30 +4543,37 @@ }, "ServiceEndPoint": { "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms.", - "properties": { - "_state": { - "description": "none", - "$ref": "#/definitions/LifecycleStatePac" - }, - "direction": { - "enum": [ - "BIDIRECTIONAL", - "SINK", - "SOURCE", - "UNDEFINED_OR_UNKNOWN" - ], - "type": "string", - "description": "none" + "allOf": [ + { + "$ref": "#/definitions/ResourceSpec" }, - "_layerProtocol": { - "items": { - "$ref": "#/definitions/LayerProtocol" - }, - "type": "array", - "description": "none", - "x-key": "localId" - } - } + { + "properties": { + "_state": { + "description": "none", + "$ref": "#/definitions/LifecycleStatePac" + }, + "direction": { + "enum": [ + "BIDIRECTIONAL", + "SINK", + "SOURCE", + "UNDEFINED_OR_UNKNOWN" + ], + "type": "string", + "description": "none" + }, + "_layerProtocol": { + "items": { + "$ref": "#/definitions/LayerProtocol" + }, + "type": "array", + "description": "none", + "x-key": "localId" + } + } + } + ] }, "LocalClass": { "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ", diff --git a/SWAGGER/TapiTopology.swagger b/SWAGGER/TapiTopology.swagger index 8f524ef1..306f37e5 100644 --- a/SWAGGER/TapiTopology.swagger +++ b/SWAGGER/TapiTopology.swagger @@ -4557,30 +4557,37 @@ }, "ServiceEndPoint": { "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms.", - "properties": { - "_state": { - "description": "none", - "$ref": "#/definitions/LifecycleStatePac" - }, - "direction": { - "enum": [ - "BIDIRECTIONAL", - "SINK", - "SOURCE", - "UNDEFINED_OR_UNKNOWN" - ], - "type": "string", - "description": "none" + "allOf": [ + { + "$ref": "#/definitions/ResourceSpec" }, - "_layerProtocol": { - "items": { - "$ref": "#/definitions/LayerProtocol" - }, - "type": "array", - "description": "none", - "x-key": "localId" - } - } + { + "properties": { + "_state": { + "description": "none", + "$ref": "#/definitions/LifecycleStatePac" + }, + "direction": { + "enum": [ + "BIDIRECTIONAL", + "SINK", + "SOURCE", + "UNDEFINED_OR_UNKNOWN" + ], + "type": "string", + "description": "none" + }, + "_layerProtocol": { + "items": { + "$ref": "#/definitions/LayerProtocol" + }, + "type": "array", + "description": "none", + "x-key": "localId" + } + } + } + ] }, "LocalClass": { "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ", diff --git a/SWAGGER/TapiVirtualNetwork.swagger b/SWAGGER/TapiVirtualNetwork.swagger index fe59a546..ee5885f2 100644 --- a/SWAGGER/TapiVirtualNetwork.swagger +++ b/SWAGGER/TapiVirtualNetwork.swagger @@ -3380,30 +3380,37 @@ }, "ServiceEndPoint": { "description": "The LogicalTerminationPoint (LTP) object class encapsulates the termination and adaptation functions of one or more transport layers. \nThe structure of LTP supports all transport protocols including circuit and packet forms.", - "properties": { - "_state": { - "description": "none", - "$ref": "#/definitions/LifecycleStatePac" - }, - "direction": { - "enum": [ - "BIDIRECTIONAL", - "SINK", - "SOURCE", - "UNDEFINED_OR_UNKNOWN" - ], - "type": "string", - "description": "none" + "allOf": [ + { + "$ref": "#/definitions/ResourceSpec" }, - "_layerProtocol": { - "items": { - "$ref": "#/definitions/LayerProtocol" - }, - "type": "array", - "description": "none", - "x-key": "localId" - } - } + { + "properties": { + "_state": { + "description": "none", + "$ref": "#/definitions/LifecycleStatePac" + }, + "direction": { + "enum": [ + "BIDIRECTIONAL", + "SINK", + "SOURCE", + "UNDEFINED_OR_UNKNOWN" + ], + "type": "string", + "description": "none" + }, + "_layerProtocol": { + "items": { + "$ref": "#/definitions/LayerProtocol" + }, + "type": "array", + "description": "none", + "x-key": "localId" + } + } + } + ] }, "LocalClass": { "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ", From b3af0dfeb89b23911f857c439f83a1d0cf9213a4 Mon Sep 17 00:00:00 2001 From: karthik-sethuraman Date: Wed, 26 Oct 2016 16:54:54 -0400 Subject: [PATCH 2/2] Fix for #153, #154 --- SWAGGER/TapiNotification.swagger | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/SWAGGER/TapiNotification.swagger b/SWAGGER/TapiNotification.swagger index 248a62ea..4e2a8473 100644 --- a/SWAGGER/TapiNotification.swagger +++ b/SWAGGER/TapiNotification.swagger @@ -2703,17 +2703,17 @@ "description": "Each transport layer is represented by a LayerProtocol (LP) instance. The LayerProtocol instances it can be used for controlling termination and monitoring functionality. \nIt can also be used for controlling the adaptation (i.e. encapsulation and/or multiplexing of client signal), tandem connection monitoring, traffic conditioning and/or shaping functionality at an intermediate point along a connection. \nWhere the client \u2013 server relationship is fixed 1:1 and immutable, the layers can be encapsulated in a single LTP instance. Where the is a n:1 relationship between client and server, the layers must be split over two separate instances of LTP. " }, "TimeRange": { + "description": "none", "properties": { - "startTime": { + "endTime": { "type": "string", "description": "none" }, - "endTime": { + "startTime": { "type": "string", "description": "none" } - }, - "description": "none" + } }, "ResourceSpec": { "$ref": "#/definitions/GlobalClass", @@ -2765,37 +2765,37 @@ "description": "none" }, "GlobalClass": { + "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. ", "properties": { "_extensions": { - "type": "array", "items": { "$ref": "#/definitions/ExtensionsSpec" }, - "x-key": "extensionsSpecification", - "description": "none" - }, - "name": { "type": "array", + "description": "none", + "x-key": "extensionsSpecification" + }, + "label": { "items": { "$ref": "#/definitions/NameAndValue" }, - "x-key": "valueName", - "description": "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity." + "type": "array", + "description": "List of labels.A property of an entity with a value that is not expected to be unique and is allowed to change. A label carries no semantics with respect to the purpose of the entity and has no effect on the entity behavior or state.", + "x-key": "valueName" }, "uuid": { "type": "string", "description": "UUID: An identifier that is universally unique\n(consider in the context of Identifier: A property of an entity/role with a value that is unique within an identifier space, where the identifier space is itself globally unique, and immutable. An identifier carries no semantics with respect to the purpose or state of the entity)" }, - "label": { - "type": "array", + "name": { "items": { "$ref": "#/definitions/NameAndValue" }, - "x-key": "valueName", - "description": "List of labels.A property of an entity with a value that is not expected to be unique and is allowed to change. A label carries no semantics with respect to the purpose of the entity and has no effect on the entity behavior or state." + "type": "array", + "description": "List of names. A property of an entity with a value that is unique in some namespace but may change during the life of the entity. A name carries no semantics with respect to the purpose of the entity.", + "x-key": "valueName" } - }, - "description": "The TAPI GlobalComponent serves as the super class for all TAPI entities that can be directly retrieved by their ID. As such, these are first class entities and their ID is expected to be globally unique. " + } }, "AdminStatePac": { "properties": {