From 602b6d26204bf06d94a96acc8b1efb1d4e41d1b6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 6 Feb 2023 18:05:00 +0100 Subject: [PATCH] Bump ietf-keystore to 2022-12-12 This is just a run-of-the-mill upgrade. Change-Id: I26ccadf05e7f864e5bacce989afa92fb1d12e274 Signed-off-by: Robert Varga --- ...2022-05-24.yang => ietf-keystore@2022-12-12.yang} | 12 +++++------- .../keystore/none/NoneKeystoreFeatureProvider.java | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) rename keystore/keystore-api/src/main/yang/{ietf-keystore@2022-05-24.yang => ietf-keystore@2022-12-12.yang} (98%) diff --git a/keystore/keystore-api/src/main/yang/ietf-keystore@2022-05-24.yang b/keystore/keystore-api/src/main/yang/ietf-keystore@2022-12-12.yang similarity index 98% rename from keystore/keystore-api/src/main/yang/ietf-keystore@2022-05-24.yang rename to keystore/keystore-api/src/main/yang/ietf-keystore@2022-12-12.yang index 345e0aa6f6..9424c45ce4 100644 --- a/keystore/keystore-api/src/main/yang/ietf-keystore@2022-05-24.yang +++ b/keystore/keystore-api/src/main/yang/ietf-keystore@2022-12-12.yang @@ -48,7 +48,7 @@ module ietf-keystore { (RFC 8174) when, and only when, they appear in all capitals, as shown here."; - revision 2022-05-24 { + revision 2022-12-12 { description "Initial version"; reference @@ -75,13 +75,14 @@ module ietf-keystore { feature asymmetric-keys { description "The 'asymmetric-keys' feature indicates that the server - supports asymmetric keys in keystores."; + implements the /keystore/asymmetric-keys subtree."; + } feature symmetric-keys { description "The 'symmetric-keys' feature indicates that the server - supports symmetric keys in keystores."; + implements the /keystore/symmetric-keys subtree."; } /****************/ @@ -197,7 +198,6 @@ module ietf-keystore { that exists in the keystore."; case local { if-feature "local-definitions-supported"; - if-feature "symmetric-keys"; container local-definition { description "Container to hold the local key definition."; @@ -234,7 +234,6 @@ module ietf-keystore { that exists in the keystore."; case local { if-feature "local-definitions-supported"; - if-feature "asymmetric-keys"; container local-definition { description "Container to hold the local key definition."; @@ -264,6 +263,7 @@ module ietf-keystore { i.e., within the using data model, or a reference to an asymmetric key (and its associated certificates) stored in the keystore. + Servers that do not 'implement' this module, and hence 'central-keystore-supported' is not defined, SHOULD augment in custom 'case' statements enabling references @@ -276,7 +276,6 @@ module ietf-keystore { that exists in the keystore."; case local { if-feature "local-definitions-supported"; - if-feature "asymmetric-keys"; container local-definition { description "Container to hold the local key definition."; @@ -316,7 +315,6 @@ module ietf-keystore { that exists in the keystore."; case local { if-feature "local-definitions-supported"; - if-feature "asymmetric-keys"; container local-definition { description "Container to hold the local key definition."; diff --git a/keystore/keystore-none/src/main/java/org/opendaylight/netconf/keystore/none/NoneKeystoreFeatureProvider.java b/keystore/keystore-none/src/main/java/org/opendaylight/netconf/keystore/none/NoneKeystoreFeatureProvider.java index a526124f3a..68cabcf46d 100644 --- a/keystore/keystore-none/src/main/java/org/opendaylight/netconf/keystore/none/NoneKeystoreFeatureProvider.java +++ b/keystore/keystore-none/src/main/java/org/opendaylight/netconf/keystore/none/NoneKeystoreFeatureProvider.java @@ -10,9 +10,9 @@ package org.opendaylight.netconf.keystore.none; import java.util.Set; import org.eclipse.jdt.annotation.NonNullByDefault; import org.kohsuke.MetaInfServices; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev220524.AsymmetricKeys; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev220524.IetfKeystoreData; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev220524.LocalDefinitionsSupported; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev221212.AsymmetricKeys; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev221212.IetfKeystoreData; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.keystore.rev221212.LocalDefinitionsSupported; import org.opendaylight.yangtools.yang.binding.YangFeature; import org.opendaylight.yangtools.yang.binding.YangFeatureProvider; -- 2.36.6