From 01078833cff9ec4121f63b4033b6bd2dfbe1b123 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:17:29 +0000 Subject: [PATCH 1/4] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 1e03291af..90871d3b9 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -8,6 +8,7 @@ module _3gpp-common-filemanagement { import _3gpp-common-yang-types { prefix types3gpp; } import _3gpp-common-yang-extensions { prefix yext3gpp; } import _3gpp-common-managed-element { prefix me3gpp; } + import ietf-inet-types { prefix inet; } organization "3GPP SA5"; contact "https://www.3gpp.org/DynaReport/TSG-WG--S5--officials.htm?Itemid=464"; @@ -17,6 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; + revision 2024-11-07 { reference CR-XXXX ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } @@ -52,12 +54,10 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - description "Provides the location of a file. - allowedValues: File URI (See RFC 8089)"; - mandatory true; - type string; + type inet:uri yext3gpp:notNotifyable; yext3gpp:inVariant; + } leaf notificationRecipientAddress { @@ -65,6 +65,19 @@ module _3gpp-common-filemanagement { type string; yext3gpp:notNotifyable; yext3gpp:inVariant; + description "Location of the file incl. the file transfer protocol, + and the file name for the case the file content cannot be retrieved + by reading the 'fileContent' attribute. + + The allowed file transfer protocols are: + - sftp + - ftpes + - https + + Examples: + 'sftp://companyA.com/datastore/fileName.xml', + 'https://companyA.com/ManagedElement=1/Files=1/File=1' + "; } leaf cancelJob { -- GitLab From 03880a119aa0d2d04eb30cd9259cc88cee42453c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:33:06 +0000 Subject: [PATCH 2/4] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 90871d3b9..a409fc571 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -57,14 +57,6 @@ module _3gpp-common-filemanagement { type inet:uri yext3gpp:notNotifyable; yext3gpp:inVariant; - - } - - leaf notificationRecipientAddress { - description "Address of the notification recipient."; - type string; - yext3gpp:notNotifyable; - yext3gpp:inVariant; description "Location of the file incl. the file transfer protocol, and the file name for the case the file content cannot be retrieved by reading the 'fileContent' attribute. @@ -79,6 +71,13 @@ module _3gpp-common-filemanagement { 'https://companyA.com/ManagedElement=1/Files=1/File=1' "; } + + leaf notificationRecipientAddress { + description "Address of the notification recipient."; + type string; + yext3gpp:notNotifyable; + yext3gpp:inVariant; + } leaf cancelJob { description "Setting this attribute to TRUE cancels the file download job. -- GitLab From dc7507ad3e052230ecc5f78ae3405e0490052cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Thu, 7 Nov 2024 06:34:57 +0000 Subject: [PATCH 3/4] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index a409fc571..7ea5c096e 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -54,7 +54,7 @@ module _3gpp-common-filemanagement { uses top3gpp:Top_Grp; leaf fileLocation { - type inet:uri + type inet:uri; yext3gpp:notNotifyable; yext3gpp:inVariant; description "Location of the file incl. the file transfer protocol, -- GitLab From 08ebb1c0285d8d9c46afba5baa1b371d7b41b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Antonio=20Ordo=C3=B1ez=20Lucena?= Date: Fri, 8 Nov 2024 13:47:16 +0000 Subject: [PATCH 4/4] Update _3gpp-common-filemanagement.yang --- yang-models/_3gpp-common-filemanagement.yang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yang-models/_3gpp-common-filemanagement.yang b/yang-models/_3gpp-common-filemanagement.yang index 7ea5c096e..4ead4f89a 100644 --- a/yang-models/_3gpp-common-filemanagement.yang +++ b/yang-models/_3gpp-common-filemanagement.yang @@ -18,7 +18,7 @@ module _3gpp-common-filemanagement { TTA, TTC). All rights reserved."; reference "3GPP TS 28.623 Generic Network Resource Model (NRM)"; - revision 2024-11-07 { reference CR-XXXX ; } + revision 2024-11-07 { reference CR-0474 ; } revision 2023-09-18 { reference CR-0271 ; } revision 2023-02-14 { reference CR-0234; } revision 2022-10-24 { reference CR-0196; } -- GitLab