Skip to content

Commit

Permalink
Merge pull request #155 from karthik-sethuraman/develop
Browse files Browse the repository at this point in the history 
Fixes for #152, #153, #154
  • Loading branch information
@rvilalta
rvilalta authored Oct 26, 2016
2 parents 97b8b6d + b3af0df commit 93fa8ee
Show file tree
Hide file tree
Showing 5 changed files with 168 additions and 133 deletions.
53 changes: 30 additions & 23 deletions SWAGGER/TapiConnectivity.swagger
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. ",
Expand Down
89 changes: 48 additions & 41 deletions SWAGGER/TapiNotification.swagger
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -2696,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",
Expand Down Expand Up @@ -2758,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": {
Expand Down
53 changes: 30 additions & 23 deletions SWAGGER/TapiPathComputation.swagger
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. ",
Expand Down
53 changes: 30 additions & 23 deletions SWAGGER/TapiTopology.swagger
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. ",
Expand Down
53 changes: 30 additions & 23 deletions SWAGGER/TapiVirtualNetwork.swagger
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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. ",
Expand Down

0 comments on commit 93fa8ee

Please sign in to comment.