separate common definitions files for SOL002 and SOL003 (eee3529c) · Commits · NFV - Network Functions Virtualisation / SOL002-SOL003

src/SOL002/VNFConfiguration/definitions/SOL002VNFConfiguration_def.yaml

+8 −8

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ definitions:
		as "deleteIdList" as defined below this table.
		type: array
		items:
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"

		VnfConfiguration:
		description: >
		@@ -90,7 +90,7 @@ definitions:
		description: >
		Additional configurable properties of the VNF instance declared in the
		VNFD as "VnfConfigurableProperties". see note.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs'

		VnfcConfigurationData:
		description: >
		@@ -105,7 +105,7 @@ definitions:
		description: >
		Identifier of a VNFC instance to which this set of configuration data applies.
		The identifier references the "id" attribute in a "VnfcInfo" structure.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf'
		intCpConfig:
		description: >
		Configuration parameters for the internal CPs of the VNFC instance.
		@@ -116,7 +116,7 @@ definitions:
		description: >
		Additional configurable properties of the VNFC instance declared in the
		VNFD as "VnfcConfigurableProperties". See note.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/KeyValuePairs'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/KeyValuePairs'

		CpConfiguration:
		description: >
		@@ -130,11 +130,11 @@ definitions:
		cpId:
		description: >
		Identifier of a CP instance within the namespace of a specific VNF instance or a VNFC instance.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf'
		cpdId:
		description: >
		Identifier of the CPD in the VNFD.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnfd'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnfd'
		addresses:
		description: >
		Network address and port assigned to the CP.
		@@ -167,11 +167,11 @@ definitions:
		macAddress:
		description: >
		Mac address. See NOTE 2.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/MacAddress'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/MacAddress'
		ipAddress:
		description: >
		IP address. See NOTE 2.
		$ref: '../../../definitions/SOL002SOL003_def.yaml#/definitions/IpAddress'
		$ref: '../../General_Definitions/SOL002_def.yaml#/definitions/IpAddress'
		useDynamicAddress:
		description: >
		Set to true if an address shall be assigned dynamically. Otherwise set to false.

src/SOL002/VNFFaultManagement/VNFFaultManagement.yaml

+2 −2

Original line number	Diff line number	Diff line
		@@ -600,7 +600,7 @@ components:
		content:
		application/json:
		schema:
		$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
		$ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"

		IndividualAlarmEscalate.Post.204:
		description: \|
		@@ -736,7 +736,7 @@ components:
		content:
		application/json:
		schema:
		$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
		$ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"

		IndividualSubscription.Get.200:
		description: \|

src/SOL002/VNFFaultManagement/definitions/SOL002VNFFaultManagement_def.yaml

+12 −12

Original line number	Diff line number	Diff line
		@@ -44,11 +44,11 @@ definitions:
		id:
		description: >
		Identifier of this Alarm.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		managedObjectId:
		description: >
		Identifier of the affected VNF instance.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		vnfcInstanceIds:
		description: >
		Identifiers of the affected VNFC instances. Each identifier references the
		@@ -56,7 +56,7 @@ definitions:
		at least one VNFC instance.
		type: array
		items:
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/IdentifierInVnf"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/IdentifierInVnf"
		rootCauseFaultyResource:
		description: >
		The virtualised resources that are causing the VNF fault. Shall be present if the alarm affects
		@@ -66,23 +66,23 @@ definitions:
		description: >
		Time stamp indicating when the alarm is raised by the managed
		object.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		alarmChangedTime:
		description: >
		Time stamp indicating when the alarm was last changed. It shall be
		present if the alarm has been updated.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		alarmClearedTime:
		description: >
		Time stamp indicating when the alarm was cleared. It shall be
		present if the alarm has been cleared.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		alarmAcknowledgedTime:
		description: >
		Time stamp indicating when the alarm was
		acknowledged. It shall be present if the alarm has
		been acknowledged.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		ackState:
		description: >
		Acknowledgement state of the alarm.
		@@ -100,7 +100,7 @@ definitions:
		eventTime:
		description: >
		Time stamp indicating when the fault was observed. See note 2.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		eventType:
		description: >
		Type of event.
		@@ -128,13 +128,13 @@ definitions:
		Attribute indicating if this fault is the root for other correlated
		alarms. If TRUE, then the alarms listed in the attribute
		CorrelatedAlarmId are caused by this fault.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Boolean"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Boolean"
		correlatedAlarmIds:
		description: >
		List of identifiers of other alarms correlated to this fault.
		type: array
		items:
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		faultDetails:
		description: >
		Provides additional information about the fault. See notes 1 and 2.
		@@ -151,13 +151,13 @@ definitions:
		self:
		description: >
		URI of this resource.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"
		objectInstance:
		description: >
		Link to the resource representing the VNF instance to which the
		notified alarm is correlated. Shall be present if the VNF
		instance information is accessible as a resource.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Link"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Link"

		PerceivedSeverityRequest:
		description: >

src/SOL002/VNFFaultManagementNotification/definitions/SOL002VNFFaultManagementNotification_def.yaml

+4 −4

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ definitions:
		Identifier of this notification. If a notification is sent multiple
		times due to multiple subscriptions, the "id" attribute of all these
		notifications shall have the same value.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		notificationType:
		description: >
		Discriminator for the different notification types. Shall be set to
		@@ -34,11 +34,11 @@ definitions:
		subscriptionId:
		description: >
		Identifier of the subscription that this notification relates to.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/Identifier"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/Identifier"
		timeStamp:
		description: >
		Date-time of the generation of the notification.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/DateTime"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/DateTime"
		alarm:
		description: >
		Information about an alarm including AlarmId, affected VNF
		@@ -54,7 +54,7 @@ definitions:
		subscription:
		description: >
		Link to the related subscription.
		$ref: "../../../definitions/SOL002SOL003_def.yaml#/definitions/NotificationLink"
		$ref: "../../General_Definitions/SOL002_def.yaml#/definitions/NotificationLink"

		AlarmClearedNotification:
		description: >

src/SOL002/VNFIndicator/VNFIndicator.yaml

+8 −8

Original line number	Diff line number	Diff line
		@@ -380,7 +380,7 @@ components:
		content:
		application/json:
		schema:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscriptionRequest
		required: true

		responses:
		@@ -420,7 +420,7 @@ components:
		schema:
		type: array
		items:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator

		VnfIndicators.Get.200:
		description: \|
		@@ -458,7 +458,7 @@ components:
		schema:
		type: array
		items:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator

		VnfIndividualIndicator.Get.200:
		description: \|
		@@ -481,7 +481,7 @@ components:
		content:
		application/json:
		schema:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicator
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicator

		VnfIndicatorSubscriptions.Get.200:
		description: \|
		@@ -519,7 +519,7 @@ components:
		schema:
		type: array
		items:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription

		VnfIndicatorSubscription.Post.201:
		description: \|
		@@ -560,7 +560,7 @@ components:
		schema:
		type: array
		items:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription

		VnfIndicatorSubscription.Post.422:
		description: \|
		@@ -599,7 +599,7 @@ components:
		content:
		application/json:
		schema:
		$ref: "../../definitions/SOL002SOL003_def.yaml#/definitions/ProblemDetails"
		$ref: "../General_Definitions/SOL002_def.yaml#/definitions/ProblemDetails"

		VnfIndicatorSubscription.Get.200:
		description: \|
		@@ -622,7 +622,7 @@ components:
		content:
		application/json:
		schema:
		$ref: ../../definitions/SOL002SOL003VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription
		$ref: definitions/SOL002VNFIndicator_def.yaml#/definitions/VnfIndicatorSubscription

		VnfIndicatorSubscription.Delete.204:
		description: \|