Editorial Changes: Reformat json schemas (38db052b) · Commits · NFV - Network Functions Virtualisation / api-tests

SOL003/VNFIndicator-API/schemas/SupportedIndicatorsChangeNotification.schema.json

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,9 @@
	"notificationType": {		"notificationType": {
	"description": "Discriminator for the different notification types. Shall be set to \"SupportedIndicatorsChangeNotification\" for this notification type.\n",		"description": "Discriminator for the different notification types. Shall be set to \"SupportedIndicatorsChangeNotification\" for this notification type.\n",
	"type": "string",		"type": "string",
	"enum": ["VnfIndicatorValueChangeNotification"]		"enum": [
			"VnfIndicatorValueChangeNotification"
			]
	},		},
	"subscriptionId": {		"subscriptionId": {
	"description": "An identifier with the intention of being globally unique.\n",		"description": "An identifier with the intention of being globally unique.\n",
	@@ -37,7 +39,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfIndicatorId"],		"required": [
			"vnfIndicatorId"
			],
	"properties": {		"properties": {
	"vnfIndicatorId": {		"vnfIndicatorId": {
	"description": "An identifier that is unique within a VNF descriptor.\n",		"description": "An identifier that is unique within a VNF descriptor.\n",
	@@ -53,12 +57,16 @@
	"_links": {		"_links": {
	"description": "Links for this resource.\n",		"description": "Links for this resource.\n",
	"type": "object",		"type": "object",
	"required": ["subscription"],		"required": [
			"subscription"
			],
	"properties": {		"properties": {
	"vnfInstance": {		"vnfInstance": {
	"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",		"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",
	@@ -69,7 +77,9 @@
	"subscription": {		"subscription": {
	"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",		"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",

SOL003/VNFIndicator-API/schemas/VnfIndicatorSubscription.schema.json

+32 −10

Original line number	Original line	Diff line number	Diff line
	{		{
	"description": "This type represents a subscription related to notifications about VNF indicator value changes.\n",		"description": "This type represents a subscription related to notifications about VNF indicator value changes.\n",
	"type": "object",		"type": "object",
	"required": ["id", "callbackUri", "_links"],		"required": [
			"id",
			"callbackUri",
			"_links"
			],
	"properties": {		"properties": {
	"id": {		"id": {
	"description": "An identifier with the intention of being globally unique.\n",		"description": "An identifier with the intention of being globally unique.\n",
	@@ -18,20 +22,28 @@
	{		{
	"oneOf": [		"oneOf": [
	{		{
	"required": ["vnfdId"]		"required": [
			"vnfdId"
			]
	},		},
	{		{
	"required": ["vnfProductsFromProviders"]		"required": [
			"vnfProductsFromProviders"
			]
	}		}
	]		]
	},		},
	{		{
	"oneOf": [		"oneOf": [
	{		{
	"required": ["vnfInstanceIds"]		"required": [
			"vnfInstanceIds"
			]
	},		},
	{		{
	"required": ["vnfInstanceNames"]		"required": [
			"vnfInstanceNames"
			]
	}		}
	]		]
	}		}
	@@ -50,7 +62,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfProvider"],		"required": [
			"vnfProvider"
			],
	"properties": {		"properties": {
	"vnfProvider": {		"vnfProvider": {
	"description": "Name of the VNF provider to match.\n",		"description": "Name of the VNF provider to match.\n",
	@@ -61,7 +75,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfProductName"],		"required": [
			"vnfProductName"
			],
	"properties": {		"properties": {
	"vnfProductName": {		"vnfProductName": {
	"description": "Name of the VNF product to match.\n",		"description": "Name of the VNF product to match.\n",
	@@ -72,7 +88,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfSoftwareVersion"],		"required": [
			"vnfSoftwareVersion"
			],
	"properties": {		"properties": {
	"vnfSoftwareVersion": {		"vnfSoftwareVersion": {
	"description": "A version.\n",		"description": "A version.\n",
	@@ -138,12 +156,16 @@
	"_links": {		"_links": {
	"description": "Links for this resource.\n",		"description": "Links for this resource.\n",
	"type": "object",		"type": "object",
	"required": ["self"],		"required": [
			"self"
			],
	"properties": {		"properties": {
	"self": {		"self": {
	"description": "This type represents a link to a resource using an absolute URI.\n",		"description": "This type represents a link to a resource using an absolute URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",

SOL003/VNFIndicator-API/schemas/VnfIndicatorSubscriptions.schema.json

+33 −11

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,11 @@
	"items": {		"items": {
	"description": "This type represents a subscription related to notifications about VNF indicator value changes.\n",		"description": "This type represents a subscription related to notifications about VNF indicator value changes.\n",
	"type": "object",		"type": "object",
	"required": ["id", "callbackUri", "_links"],		"required": [
			"id",
			"callbackUri",
			"_links"
			],
	"properties": {		"properties": {
	"id": {		"id": {
	"description": "An identifier with the intention of being globally unique.\n",		"description": "An identifier with the intention of being globally unique.\n",
	@@ -20,20 +24,28 @@
	{		{
	"oneOf": [		"oneOf": [
	{		{
	"required": ["vnfdId"]		"required": [
			"vnfdId"
			]
	},		},
	{		{
	"required": ["vnfProductsFromProviders"]		"required": [
			"vnfProductsFromProviders"
			]
	}		}
	]		]
	},		},
	{		{
	"oneOf": [		"oneOf": [
	{		{
	"required": ["vnfInstanceIds"]		"required": [
			"vnfInstanceIds"
			]
	},		},
	{		{
	"required": ["vnfInstanceNames"]		"required": [
			"vnfInstanceNames"
			]
	}		}
	]		]
	}		}
	@@ -52,7 +64,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfProvider"],		"required": [
			"vnfProvider"
			],
	"properties": {		"properties": {
	"vnfProvider": {		"vnfProvider": {
	"description": "Name of the VNF provider to match.\n",		"description": "Name of the VNF provider to match.\n",
	@@ -63,7 +77,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfProductName"],		"required": [
			"vnfProductName"
			],
	"properties": {		"properties": {
	"vnfProductName": {		"vnfProductName": {
	"description": "Name of the VNF product to match.\n",		"description": "Name of the VNF product to match.\n",
	@@ -74,7 +90,9 @@
	"type": "array",		"type": "array",
	"items": {		"items": {
	"type": "object",		"type": "object",
	"required": ["vnfSoftwareVersion"],		"required": [
			"vnfSoftwareVersion"
			],
	"properties": {		"properties": {
	"vnfSoftwareVersion": {		"vnfSoftwareVersion": {
	"description": "A version.\n",		"description": "A version.\n",
	@@ -140,12 +158,16 @@
	"_links": {		"_links": {
	"description": "Links for this resource.\n",		"description": "Links for this resource.\n",
	"type": "object",		"type": "object",
	"required": ["self"],		"required": [
			"self"
			],
	"properties": {		"properties": {
	"self": {		"self": {
	"description": "This type represents a link to a resource using an absolute URI.\n",		"description": "This type represents a link to a resource using an absolute URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",

SOL003/VNFIndicator-API/schemas/VnfIndicatorValueChangeNotification.schema.json

+14 −5

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,9 @@
	"notificationType": {		"notificationType": {
	"description": "Discriminator for the different notification types. Shall be set to \"VnfIndicatorValueChangeNotification\" for this notification type.\n",		"description": "Discriminator for the different notification types. Shall be set to \"VnfIndicatorValueChangeNotification\" for this notification type.\n",
	"type": "string",		"type": "string",
	"enum": ["VnfIndicatorValueChangeNotification"]		"enum": [
			"VnfIndicatorValueChangeNotification"
			]
	},		},
	"subscriptionId": {		"subscriptionId": {
	"description": "An identifier with the intention of being globally unique.\n",		"description": "An identifier with the intention of being globally unique.\n",
	@@ -49,12 +51,17 @@
	"_links": {		"_links": {
	"description": "Links for this resource.\n",		"description": "Links for this resource.\n",
	"type": "object",		"type": "object",
	"required": ["vnfInstance", "subscription"],		"required": [
			"vnfInstance",
			"subscription"
			],
	"properties": {		"properties": {
	"vnfInstance": {		"vnfInstance": {
	"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",		"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",
	@@ -65,7 +72,9 @@
	"subscription": {		"subscription": {
	"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",		"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",

SOL003/VNFIndicator-API/schemas/vnfIndicator.schema.json

+16 −4

Original line number	Original line	Diff line number	Diff line
	{		{
	"description": "This type represents a VNF indicator value.\nNOTE:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.\n",		"description": "This type represents a VNF indicator value.\nNOTE:\tETSI GS NFV-SOL 001 specifies the structure and format of the VNFD based on TOSCA specifications.\n",
	"type": "object",		"type": "object",
	"required": ["id", "value", "vnfInstanceId", "_links"],		"required": [
			"id",
			"value",
			"vnfInstanceId",
			"_links"
			],
	"properties": {		"properties": {
	"id": {		"id": {
	"description": "An identifier that is unique within a VNF descriptor.\n",		"description": "An identifier that is unique within a VNF descriptor.\n",
	@@ -22,12 +27,17 @@
	"_links": {		"_links": {
	"description": "Links for this resource.\n",		"description": "Links for this resource.\n",
	"type": "object",		"type": "object",
	"required": ["self", "vnfInstance"],		"required": [
			"self",
			"vnfInstance"
			],
	"properties": {		"properties": {
	"self": {		"self": {
	"description": "This type represents a link to a resource using an absolute URI.\n",		"description": "This type represents a link to a resource using an absolute URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",
	@@ -38,7 +48,9 @@
	"vnfInstance": {		"vnfInstance": {
	"description": "This type represents a link to a resource using an absolute URI.\n",		"description": "This type represents a link to a resource using an absolute URI.\n",
	"type": "object",		"type": "object",
	"required": ["href"],		"required": [
			"href"
			],
	"properties": {		"properties": {
	"href": {		"href": {
	"description": "String formatted according to IETF RFC 3986.\n",		"description": "String formatted according to IETF RFC 3986.\n",

Admin message