add oam super node and refractor cfm + add state variables to pm pro…

…files
openconfig · Oct 18, 2024 · 1dfb64e · 1dfb64e
1 parent 57fa1b2
commit 1dfb64e
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 19 deletions.
diff --git a/release/models/cfm/.spec.yml b/release/models/cfm/.spec.yml
diff --git a/release/models/oam/.spec.yml b/release/models/oam/.spec.yml
@@ -0,0 +1,9 @@
+- name: openconfig-oam
+  docs:
+    - yang/oam/openconfig-oam.yang
+    - yang/oam/openconfig-cfm-types.yang
+    - yang/oam/openconfig-oam-cfm.yang
+  build:
+    - yang/oam/openconfig-oam.yang
+    - yang/oam/openconfig-oam-cfm.yang
+  run-ci: true
diff --git a/release/models/cfm/openconfig-cfm-types.yang → release/models/oam/openconfig-cfm-types.yang b/release/models/cfm/openconfig-cfm-types.yang → release/models/oam/openconfig-cfm-types.yang
@@ -3,7 +3,7 @@ module openconfig-cfm-types {
   yang-version "1";
 
   // namespace
-  namespace "http://openconfig.net/yang/cfm-types";
+  namespace "http://openconfig.net/yang/oam/cfm-types";
 
   prefix "oc-cfm-types";
 

diff --git a/release/models/cfm/openconfig-cfm.yang → release/models/oam/openconfig-oam-cfm.yang b/release/models/cfm/openconfig-cfm.yang → release/models/oam/openconfig-oam-cfm.yang
@@ -1,16 +1,17 @@
-module openconfig-cfm {
+module openconfig-oam-cfm {
 
   yang-version "1";
 
   // namespace
-  namespace "http://openconfig.net/yang/cfm";
+  namespace "http://openconfig.net/yang/oam/cfm";
 
-  prefix "oc-cfm";
+  prefix "oc-oam-cfm";
   import openconfig-vlan-types { prefix oc-vlan-types; }
   import openconfig-interfaces { prefix oc-if; }
   import openconfig-extensions { prefix oc-ext; }
   import openconfig-yang-types { prefix oc-yang; }
   import openconfig-cfm-types { prefix oc-cfm-types; }
+  import openconfig-oam { prefix oc-oam; } // imports the module being augmented
 
 
  // google
@@ -160,18 +161,12 @@ module openconfig-cfm {
                               description  "A unique profile name identifying the profile";
                               type string;
                             }
-
                           }
 
                           container state {
                             description "Operational data for loss measurement.";
                             config false;
-
-                            leaf "profile-name" {
-                              type string;
-                              description "Name of the measurement profile.";
-                              }
-
+                            uses performance-measurement-config;
                             uses performance-measurement-state;
                           }
                         }
@@ -1258,7 +1253,7 @@ module openconfig-cfm {
     leaf packet-per-burst {
       type uint32;
       description
-      "if burst enabled. the leaf defines the number of packet per burst of probes.
+      "if burst enabled. The leaf defines the number of packet per burst of probes.
       packets-per-measurement-period / burst-interval";
     }
   }
@@ -1303,6 +1298,11 @@ module openconfig-cfm {
     }
   }
 
-  uses cfm-top;
+  // augment statements
 
+  augment "/oc-oam:oam" {
+     description
+      "Add cfm related state and config to oam";
+    uses cfm-top;
+  }
 }
diff --git a/release/models/oam/openconfig-oam.yang b/release/models/oam/openconfig-oam.yang
@@ -0,0 +1,53 @@
+module openconfig-oam {
+
+  yang-version "1";
+
+  // namespace
+  namespace "http://openconfig.net/yang/oam";
+
+  prefix "oc-oam";
+  import openconfig-extensions { prefix oc-ext; }
+
+ // google
+  organization "OpenConfig working group";
+
+  contact
+    "OpenConfig working group
+    www.openconfig.net";
+
+  description
+    "This module defines a YANG data model for configuring and managing
+    EthernetOAM functions";
+
+  oc-ext:openconfig-version "0.1.0";
+
+  revision "2024-09-11" {
+    description
+      "Initial revision";
+    reference "0.1.0";
+  }
+
+  grouping oam-top{
+    description
+      "top level grouping for configuration and operational state parameters relating
+      to Ethernet OAM";
+
+    container oam {
+      description
+        "Operational state and configuration parameters relating to
+         Ethernet OAM";
+
+      container config {
+        description
+          "Configuration parameters relating to Ethernet OAM";
+      }
+      container state {
+        config false;
+        description
+          "Operational state parameters relating to Ethernet OAM";
+      }
+    }
+  }
+
+  uses oam-top;
+}