Merge branch 'master' into dplore/linkbw-extcomm

.github/workflows/diff.yaml

@@ -0,0 +1,42 @@
+name: Breaking Changes
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: major version update check
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Install go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.x'
+
+    - name: Check out code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install openconfig-ci CLI
+      run: |
+        go install github.com/openconfig/models-ci/openconfig-ci@c880ed2
+
+    - name: Make sure all backward-incompatible changes are covered by version changes.
+      id: check
+      run: |
+        readonly HEAD=${{ github.event.pull_request.head.sha }}
+        readonly BASE="$(git merge-base origin/master "${HEAD}")"
+
+        BASEREPODIR=public_base
+        mkdir -p "${BASEREPODIR}/release"
+        git checkout "${BASE}"
+        cp -r release/models "${BASEREPODIR}/release" 
+        cp -r third_party "${BASEREPODIR}" 
+        git checkout "${HEAD}"
+        oldroot="${BASEREPODIR}"
+        newroot=.
+
+        openconfig-ci diff --disallowed-incompats --oldp "${oldroot}/third_party" --oldroot "${oldroot}/release/models" --newp "${newroot}/third_party" --newroot "${newroot}/release/models"

cloudbuild.yaml

@@ -52,7 +52,7 @@ steps:
     git clone git@github.com:openconfig/models-ci.git /go/src/github.com/openconfig/models-ci
     cd /go/src/github.com/openconfig/models-ci
     # Modify the major version to update models-ci version.
-    branch=$(git tag -l 'v10.*' | sort -V | tail -1)
+    branch=$(git tag -l 'v11.*' | sort -V | tail -1)
     git checkout $branch
   volumes:
   - name: 'ssh'
@@ -213,16 +213,6 @@ steps:
   id: 'oc-pyang'
 
 ############### GOYANG/YGOT ###############
-- name: 'golang'
-  entrypoint: 'go'
-  args: ['install', 'github.com/openconfig/ygot/generator@latest']
-  volumes:
-  - name: 'gopath'
-    path: /go
-  env:
-  - 'GOPATH=/go'
-  waitFor: ['go path creation']
-  id: 'goyang-ygot prep'
 - name: 'us-west1-docker.pkg.dev/$PROJECT_ID/models-ci/models-ci-image'
   entrypoint: 'bash'
   args: ['-c', "/go/src/github.com/openconfig/models-ci/validators/goyang-ygot/test.sh"]
@@ -237,7 +227,7 @@ steps:
   - 'COMMIT_SHA=$COMMIT_SHA'
   - '_REPO_SLUG=$_REPO_SLUG'
   - 'BRANCH_NAME=$BRANCH_NAME'
-  waitFor: ['validator prep', 'goyang-ygot prep', 'oc-pyang']
+  waitFor: ['validator prep', 'go path creation', 'oc-pyang']
   id: 'goyang-ygot'
 
 ############### PYANG ###############

release/models/macsec/openconfig-macsec.yang

@@ -18,12 +18,18 @@ module openconfig-macsec {
     "This module defines configuration and state data for
      MACsec IEEE Std 802.1AE-2018.";
 
-  oc-ext:openconfig-version "1.1.0";
+  oc-ext:openconfig-version "1.1.1";
   oc-ext:regexp-posix;
   oc-ext:catalog-organization "openconfig";
   oc-ext:origin "openconfig";
 
-  revision "2023-06-08" {
+  revision "2023-08-03" {
+    description
+      "Clarify in-cak and out-cak leaf descriptions.";
+    reference "1.1.1";
+  }
+
+revision "2023-06-08" {
     description
       "Support rx-late-pkts leaf.";
     reference "1.1.0";
@@ -190,7 +196,9 @@ module openconfig-macsec {
     leaf in-cak-mkpdu {
       type oc-yang:counter64;
       description
-        "Validated MKPDU received CAK count";
+        "Count of validated MKPDU  connectivity association key (CAK) pdus
+        received.  This counter is related to the group-cak feature in the
+        802.1X-2010 standard.";
     }
 
     leaf out-mkpdu {
@@ -208,7 +216,9 @@ module openconfig-macsec {
     leaf out-cak-mkpdu {
       type oc-yang:counter64;
       description
-        "MKPDU CAK sent count";
+        "Count of MKPDU connectivity association key (CAK) pdu's sent.
+        This counter is related to the group-cak feature in the
+        802.1X-2010 standard.";
     }
   }