From 0226b743bdcede4c869aa8b6aca5d51cacae5e24 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 6 May 2022 09:37:53 +0000 Subject: [PATCH 1/8] Update OpenAPI/coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 908756fa5..848986d25 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -72,6 +72,23 @@ components: items: $ref: '#/components/schemas/AssuranceTarget' + AttributeName: + type: string + + AttributeNameList: + type: array + items: + $ref: '#/components/schemas/AttributeName' + + ACCLDisallowedAttribute: + type: object + properties: + managedEntityIdentifier: + $ref: 'comDefs.yaml#/components/schemas/Dn' + attributeNameList: + $ref: '#/components/schemas/AttributeNameList' + + #-------- Definition of concrete IOCs -------------------------------------------- @@ -116,7 +133,9 @@ components: administrativeState: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: - $ref: '#/components/schemas/ControlLoopLifeCyclePhase' + $ref: '#/components/schemas/ControlLoopLifeCyclePhase + aCCLDisallowedList: + $ref: '#/components/schemas/ACCLDisallowedAttribute' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' -- GitLab From f7ba55f2e6f57d610a24b5defc10a06808d36a18 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 6 May 2022 09:49:17 +0000 Subject: [PATCH 2/8] Update coslaNrm.yaml, added missing ' --- OpenAPI/coslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 848986d25..32e29e89f 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -133,7 +133,7 @@ components: administrativeState: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: - $ref: '#/components/schemas/ControlLoopLifeCyclePhase + $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $ref: '#/components/schemas/ACCLDisallowedAttribute' AssuranceGoal: -- GitLab From 1e45be0a198ffcf55e3541f2b7d21b5c830bc696 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 12 May 2022 10:47:17 +0000 Subject: [PATCH 3/8] Update coslaNrm.yaml, removed attributeName definition --- OpenAPI/coslaNrm.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 32e29e89f..3d29cdf12 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -71,14 +71,11 @@ components: type: array items: $ref: '#/components/schemas/AssuranceTarget' - - AttributeName: - type: string - + AttributeNameList: type: array items: - $ref: '#/components/schemas/AttributeName' + type: string ACCLDisallowedAttribute: type: object -- GitLab From d0098d8e020ac94de004044ae5d9b7c92921f5ab Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Sun, 15 May 2022 19:20:21 +0000 Subject: [PATCH 4/8] Update coslaNrm.yaml updated to fix ACCLDisallowedAttributes --- OpenAPI/coslaNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 3d29cdf12..09db7a450 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -77,7 +77,7 @@ components: items: type: string - ACCLDisallowedAttribute: + ACCLDisallowedAttributes: type: object properties: managedEntityIdentifier: @@ -132,7 +132,7 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttribute' + $ref: '#/components/schemas/ACCLDisallowedAttributes' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' -- GitLab From 7b1d40c7f6cfa3202e7fc5fd2126db25c2a957f2 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 6 May 2022 09:37:53 +0000 Subject: [PATCH 5/8] Update OpenAPI/coslaNrm.yaml --- OpenAPI/coslaNrm.yaml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 82e217509..0596a81be 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -72,13 +72,28 @@ components: items: $ref: '#/components/schemas/AssuranceTarget' + AttributeName: + type: string + + AttributeNameList: + type: array + items: + $ref: '#/components/schemas/AttributeName' + + ACCLDisallowedAttribute: + type: object + properties: + managedEntityIdentifier: + $ref: 'comDefs.yaml#/components/schemas/Dn' + attributeNameList: + $ref: '#/components/schemas/AttributeNameList' + AssuranceScope: type: object properties: taiList: $ref: 'nrNrm.yaml#/components/schemas/TaiList' - #-------- Definition of concrete IOCs -------------------------------------------- SubNetwork-Single: @@ -122,7 +137,9 @@ components: administrativeState: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: - $ref: '#/components/schemas/ControlLoopLifeCyclePhase' + $ref: '#/components/schemas/ControlLoopLifeCyclePhase + aCCLDisallowedList: + $ref: '#/components/schemas/ACCLDisallowedAttribute' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' -- GitLab From bba0e275f98d1deccc7da07bac976219a0602c7e Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Fri, 6 May 2022 09:49:17 +0000 Subject: [PATCH 6/8] Update coslaNrm.yaml, added missing ' --- OpenAPI/coslaNrm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 0596a81be..5250eb4fb 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -137,7 +137,7 @@ components: administrativeState: $ref: 'comDefs.yaml#/components/schemas/AdministrativeState' controlLoopLifeCyclePhase: - $ref: '#/components/schemas/ControlLoopLifeCyclePhase + $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: $ref: '#/components/schemas/ACCLDisallowedAttribute' AssuranceGoal: -- GitLab From 110ea48141fa03df21bdbb12ae7ef54ccd4e5699 Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Thu, 12 May 2022 10:47:17 +0000 Subject: [PATCH 7/8] Update coslaNrm.yaml, removed attributeName definition --- OpenAPI/coslaNrm.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 5250eb4fb..1f86c2eb0 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -71,14 +71,11 @@ components: type: array items: $ref: '#/components/schemas/AssuranceTarget' - - AttributeName: - type: string - + AttributeNameList: type: array items: - $ref: '#/components/schemas/AttributeName' + type: string ACCLDisallowedAttribute: type: object -- GitLab From 541dba357a2458658533a735b5655d786c417f1c Mon Sep 17 00:00:00 2001 From: Jan Groenendijk Date: Sun, 15 May 2022 19:20:21 +0000 Subject: [PATCH 8/8] Update coslaNrm.yaml updated to fix ACCLDisallowedAttributes --- OpenAPI/coslaNrm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenAPI/coslaNrm.yaml b/OpenAPI/coslaNrm.yaml index 1f86c2eb0..8d9d8788d 100755 --- a/OpenAPI/coslaNrm.yaml +++ b/OpenAPI/coslaNrm.yaml @@ -77,7 +77,7 @@ components: items: type: string - ACCLDisallowedAttribute: + ACCLDisallowedAttributes: type: object properties: managedEntityIdentifier: @@ -136,7 +136,7 @@ components: controlLoopLifeCyclePhase: $ref: '#/components/schemas/ControlLoopLifeCyclePhase' aCCLDisallowedList: - $ref: '#/components/schemas/ACCLDisallowedAttribute' + $ref: '#/components/schemas/ACCLDisallowedAttributes' AssuranceGoal: $ref: '#/components/schemas/AssuranceGoal-Multiple' -- GitLab