Merge branch '28.623_Rel-17_CR0140_Add_support_for_MnS_Discovery' into... (866c40f8) · Commits · Miguel Angel Reina Ortega / Management and Orchestration APIs

OpenAPI/genericNrm.yaml

+29 −12

Original line number	Diff line number	Diff line
		@@ -1207,9 +1207,8 @@ components:
		AlarmList:
		$ref: '#/components/schemas/AlarmList-Single'
		MnsRegistry:
		type: array
		items:
		$ref: '#/components/schemas/MnsRegistry'
		$ref: '#/components/schemas/MnsRegistry-Single'

		ManagedElement-ncO:
		type: object
		properties:
		@@ -1346,17 +1345,11 @@ components:
		TraceJob:
		$ref: '#/components/schemas/TraceJob-Multiple'

		MnsRegistry:
		MnsRegistry-Single:
		type: object
		properties:
		mnsLabel:
		type: string
		mnsType:
		type: string
		mnsVersion:
		type: string
		mnsAddress:
		type: string
		MnsInfo:
		$ref: '#/components/schemas/MnsInfo-Multiple'

		#-------- Definition of concrete IOCs --------------------------------------------

		@@ -1547,6 +1540,24 @@ components:
		additionalProperties:
		$ref: 'faultMnS.yaml#/components/schemas/AlarmRecord'

		MnsInfo-Single:
		type: object
		properties:
		mnsLabel:
		type: string
		mnsType:
		type: string
		enum:
		- ProvMnS
		- FaultSupervisionMnS
		- StreamingDataReportingMnS
		- FileDataReportingMnS
		mnsVersion:
		type: string
		mnsAddress:
		description: Resource URI as defined in the relevant Technical Specification
		$ref: 'comDefs.yaml#/components/schemas/Uri'

		#-------- Definition of JSON arrays for name-contained IOCs ----------------------

		VsDataContainer-Multiple:
		@@ -1581,6 +1592,10 @@ components:
		type: array
		items:
		$ref: '#/components/schemas/TraceJob-Single'
		MnsInfo-Multiple:
		type: array
		items:
		$ref: '#/components/schemas/MnsInfo-Single'

		#-------- Definitions in TS 28.623 for TS 28.532 ---------------------------------

		@@ -1604,3 +1619,5 @@ components:
		- $ref: '#/components/schemas/TraceJob-Single'

		- $ref: '#/components/schemas/AlarmList-Single'
		- $ref: '#/components/schemas/MnsRegistry-Single'
		- $ref: '#/components/schemas/MnsInfo-Single'

yang-models/_3gpp-common-mnsregistry.yang

+40 −19

Original line number	Diff line number	Diff line
		@@ -12,13 +12,12 @@ module _3gpp-common-mnsregistry {
		Class (IOC) that is part of the Generic Network Resource Model (NRM).";
		reference "3GPP TS 28.623 Generic Network Resource Model (NRM)";

		revision 2021-10-18 { reference "S5-215263"; }
		revision 2021-08-29 { reference "Initial revision, S5-214388"; }

		grouping MNSRegistryGrp {
		description "Represents the MNSRegistry IOC.";
		reference "3GPP TS 28.541";
		uses top3gpp:Top_Grp;

		grouping MNSInfoGrp {
		description "Represents the MNSInfo IOC.";
		reference "3GPP TS 28.622";
		leaf mnsLabel {
		description "Human-readable name of management service.";
		mandatory true;
		@@ -28,9 +27,10 @@ module _3gpp-common-mnsregistry {
		leaf mnsType {
		description "Type of management service.";
		type enumeration {
		enum PROVISIONING;
		enum FAULT_SUPERVISION;
		enum PERFORMANCE_ASSURANCE;
		enum ProvMnS;
		enum FaultSupervisionMnS;
		enum StreamingDataReportingMnS;
		enum FileDataReportingMnS;
		}
		}

		@@ -46,14 +46,35 @@ module _3gpp-common-mnsregistry {
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		list MNSRegistry {
		grouping MNSInfo {
		description "Represents the MNSInfo IOC.";
		reference "3GPP TS 28.622";
		uses top3gpp:Top_Grp;
		container attributes {
		uses MNSInfoGrp;
		}
		}

		grouping MNSRegistryGrp {
		description "Represents the MNSRegistry IOC.";
		key id;
		reference "3GPP TS 28.622";
		uses top3gpp:Top_Grp;
		}

		grouping MNSRegistry {
		list mnsRegistry {
		description "Represents the MNSRegistry IOC.";
		reference "3GPP TS 28.622";
		uses top3gpp:Top_Grp;
		key "mnsType mnsVersion mnsAddress";
		container attributes {
		uses MNSRegistryGrp;
		uses MNSInfoGrp;
		}
		}
		}

		augment "/subnet3gpp:SubNetwork" {
		uses MNSRegistryGrp;
		}

		}
		No newline at end of file