Skip to content

Commit

Permalink
Update oc-macsec model to use oc-keychain model openconfig#606 (open…
Browse files Browse the repository at this point in the history
…config#614)

Remove key-chain container from macsec openconfig model completely
 and use global key-chain model instead.
  • Loading branch information
m26singhvi authored May 23, 2022
1 parent bb5ba40 commit 70607a3
Showing 1 changed file with 10 additions and 56 deletions.
66 changes: 10 additions & 56 deletions release/models/macsec/openconfig-macsec.yang
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module openconfig-macsec {
import openconfig-interfaces { prefix oc-if; }
import openconfig-macsec-types { prefix macsec-types; }
import openconfig-yang-types { prefix oc-yang; }
import openconfig-keychain { prefix "oc-keychain"; }

organization
"OpenConfig working group";
Expand All @@ -17,11 +18,17 @@ module openconfig-macsec {
"This module defines configuration and state data for
MACsec IEEE Std 802.1AE-2018.";

oc-ext:openconfig-version "0.2.0";
oc-ext:openconfig-version "1.0.0";
oc-ext:regexp-posix;
oc-ext:catalog-organization "openconfig";
oc-ext:origin "openconfig";

revision "2022-04-28" {
description
"Use global key chain model.";
reference "1.0.0";
}

revision "2020-05-01" {
description
"Move identifiers for scsa-[tr]x out of
Expand Down Expand Up @@ -136,59 +143,6 @@ module openconfig-macsec {
}
}

grouping macsec-mka-key-chain-config {
description
"MKA Key chain config grouping";

leaf name {
type string;
description
"MKA Key-chain name";
}
}

grouping macsec-mka-key-chain-top {
description
"MKA key chain top level grouping";

container key-chains {
description
"Enclosing container for the MKA key chains";

list key-chain {
key "name";

description
"MKA Key chain name";

leaf name {
type leafref {
path "../config/name";
}
description
"Reference to the MKA Key chain name";
}

container config {
description
"Configuration of the MKA key chain";

uses macsec-mka-key-chain-config;
}

container state {
config false;
description
"Operational state data for MKA key chain";

uses macsec-mka-key-chain-config;
}

uses macsec-mka-key-top;
}
}
}

grouping macsec-mka-interface-config {
description
"MKA interface config grouping";
Expand All @@ -203,7 +157,8 @@ module openconfig-macsec {

leaf key-chain {
type leafref {
path "/macsec/mka/key-chains/key-chain/name";
path "/oc-keychain:keychains/oc-keychain:keychain/" +
"oc-keychain:name";
}
description
"Configure Key Chain name";
Expand Down Expand Up @@ -812,7 +767,6 @@ module openconfig-macsec {
"The MKA";

uses macsec-mka-policy-top;
uses macsec-mka-key-chain-top;
uses macsec-mka-global-top;
}
}
Expand Down

0 comments on commit 70607a3

Please sign in to comment.