From 6f74e5e480f47b607aec406e604a62525e11dfb9 Mon Sep 17 00:00:00 2001
From: malim <malm5@asiainfo.com>
Date: Wed, 11 May 2022 08:11:35 +0000
Subject: [PATCH 1/3] Update OpenAPI/EdgeNRM.yaml

---
 OpenAPI/EdgeNRM.yaml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml
index d811e1e5a..258baf5cf 100644
--- a/OpenAPI/EdgeNRM.yaml
+++ b/OpenAPI/EdgeNRM.yaml
@@ -74,7 +74,24 @@ components:
           type: integer
         swImageRef:
           type: string
-
+    EASRegistrationInfo:
+      type: object
+      properties:
+        eASregistrationExpiry:
+          type: string
+        eASregistrationID:
+          type: string
+        eASsecCredential:
+          type: string
+    EESRegistrationInfo:
+      type: object
+      properties:
+        eESregistrationExpiry:
+          type: string
+        eESregistrationID:
+          type: string
+        eESsecCredential:
+          type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------
 
@@ -128,8 +145,12 @@ components:
                       type: string
                     eASRequirementsRef:
                       $ref: 'comDefs.yaml#/components/schemas/Dn'
+                    eASFunctionRef:
+                      $ref: 'comDefs.yaml#/components/schemas/DnList'
                     eASAddress:
                       type: string
+                    eASRegistrationInfo:
+                      $ref: '#/components/schemas/EASRegistrationInfo'  
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     EESFunction-Single:
       allOf:
@@ -151,8 +172,10 @@ components:
                       $ref: '#/components/schemas/SoftwareImageInfo'
                     serviceContinuitySupport:
                       type: boolean
-                    eASFunctonRef:
+                    eASFunctionRef:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'  
+                    eESRegistrationInfo:
+                      $ref: '#/components/schemas/EESRegistrationInfo'  
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     ECSFunction-Single:
-- 
GitLab


From 5b38a55db0426e3cba536d2dabe6d62f5f6e98a0 Mon Sep 17 00:00:00 2001
From: malim <malm5@asiainfo.com>
Date: Wed, 11 May 2022 08:22:45 +0000
Subject: [PATCH 2/3] Update OpenAPI/EdgeNRM.yaml

---
 OpenAPI/EdgeNRM.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml
index 258baf5cf..54c8cac95 100644
--- a/OpenAPI/EdgeNRM.yaml
+++ b/OpenAPI/EdgeNRM.yaml
@@ -145,7 +145,7 @@ components:
                       type: string
                     eASRequirementsRef:
                       $ref: 'comDefs.yaml#/components/schemas/Dn'
-                    eASFunctionRef:
+                    eESFunctionRef:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'
                     eASAddress:
                       type: string
-- 
GitLab


From c817dd927f635412ab2ce794838ebf94669ba487 Mon Sep 17 00:00:00 2001
From: malim <malm5@asiainfo.com>
Date: Thu, 12 May 2022 05:28:32 +0000
Subject: [PATCH 3/3] Update OpenAPI/EdgeNRM.yaml

---
 OpenAPI/EdgeNRM.yaml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/OpenAPI/EdgeNRM.yaml b/OpenAPI/EdgeNRM.yaml
index 54c8cac95..eddcee345 100644
--- a/OpenAPI/EdgeNRM.yaml
+++ b/OpenAPI/EdgeNRM.yaml
@@ -74,23 +74,14 @@ components:
           type: integer
         swImageRef:
           type: string
-    EASRegistrationInfo:
+    RegistrationInfo:
       type: object
       properties:
-        eASregistrationExpiry:
+        registrationExpiry:
           type: string
-        eASregistrationID:
+        registrationID:
           type: string
-        eASsecCredential:
-          type: string
-    EESRegistrationInfo:
-      type: object
-      properties:
-        eESregistrationExpiry:
-          type: string
-        eESregistrationID:
-          type: string
-        eESsecCredential:
+        secCredential:
           type: string
 
 #-------- Definition of concrete IOCs --------------------------------------------
@@ -149,8 +140,8 @@ components:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'
                     eASAddress:
                       type: string
-                    eASRegistrationInfo:
-                      $ref: '#/components/schemas/EASRegistrationInfo'  
+                    registrationInfo:
+                      $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
     EESFunction-Single:
       allOf:
@@ -174,8 +165,8 @@ components:
                       type: boolean
                     eASFunctionRef:
                       $ref: 'comDefs.yaml#/components/schemas/DnList'  
-                    eESRegistrationInfo:
-                      $ref: '#/components/schemas/EESRegistrationInfo'  
+                    registrationInfo:
+                      $ref: '#/components/schemas/RegistrationInfo'  
         - $ref: 'genericNrm.yaml#/components/schemas/ManagedFunction-ncO'
 
     ECSFunction-Single:
-- 
GitLab