Sync CzechLight packages
One YANG model got bumped, so I took this opportunity to clean up the
rest as well.
Also syncing everything while I'm at this.
Change-Id: Ia7f69206e3e99f771426c094b2964f014b5c2f68
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/cla-sysrepo/+/3202
Depends-on: https://cesnet-gerrit-public/c/CzechLight/cla-sysrepo/+/3202
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/cla-sysrepo/+/3202
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/lldp-systemd-networkd-sysrepo/+/3201
Depends-on: https://cesnet-gerrit-public/c/CzechLight/lldp-systemd-networkd-sysrepo/+/3201
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/lldp-systemd-networkd-sysrepo/+/3201
Depends-on: https://cesnet-gerrit-czechlight/c/CzechLight/netconf-cli/+/3204
Depends-on: https://cesnet-gerrit-public/c/CzechLight/netconf-cli/+/3204
Depends-on: https://gerrit.cesnet.cz/c/CzechLight/netconf-cli/+/3204
diff --git a/package/cla-sysrepo/czechlight-install-yang.sh b/package/cla-sysrepo/czechlight-install-yang.sh
index a528a0c..6585b54 100755
--- a/package/cla-sysrepo/czechlight-install-yang.sh
+++ b/package/cla-sysrepo/czechlight-install-yang.sh
@@ -50,7 +50,7 @@
fi
if [[ ${YANG_ROADM} == 1 && ! -f ${REPO}/czechlight-roadm-device@2019-09-30.yang ]]; then
- sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-roadm-device.yang
+ sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-roadm-device@2019-09-30.yang
sysrepoctl --change czechlight-roadm-device --group optics --permissions 0664 --apply
if [[ ${WITH_FEATURE} ]]; then
sysrepoctl --change czechlight-roadm-device --enable-feature ${WITH_FEATURE}
@@ -59,25 +59,29 @@
fi
if [[ ${YANG_COHERENT} == 1 && ! -f ${REPO}/czechlight-coherent-add-drop@2019-09-30.yang ]]; then
- sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-coherent-add-drop.yang
+ sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-coherent-add-drop@2019-09-30.yang
sysrepoctl --change czechlight-coherent-add-drop --group optics --permissions 0664 --apply
sysrepocfg --datastore=startup --format=json --module=czechlight-coherent-add-drop --new-data="${YANG_DIR}/${CZECHLIGHT}.json"
fi
if [[ ${YANG_INLINE} == 1 && ! -f ${REPO}/czechlight-inline-amp@2019-09-30.yang ]]; then
- sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-inline-amp.yang
+ sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-inline-amp@2019-09-30.yang
sysrepoctl --change czechlight-inline-amp --group optics --permissions 0664 --apply
sysrepocfg --datastore=startup --format=json --module=czechlight-inline-amp --import="${YANG_DIR}/${CZECHLIGHT}.json"
fi
if [[ ${YANG_CALIBRATION} == 1 && ! -f ${REPO}/czechlight-calibration-device@2019-06-25.yang ]]; then
- sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-calibration-device.yang
+ sysrepoctl --search-dirs ${YANG_DIR} --install ${YANG_DIR}/czechlight-calibration-device@2019-06-25.yang
sysrepoctl --change czechlight-calibration-device --group optics --permissions 0664 --apply
sysrepocfg --datastore=startup --format=json --module=czechlight-calibration-device --import="${YANG_DIR}/${CZECHLIGHT}.json"
fi
-if [[ ! -f ${REPO}/czechlight-lldp@2020-08-25.yang ]]; then
- sysrepoctl --search-dirs /usr/share/lldp-systemd-networkd-sysrepo/yang --install /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp.yang
+if [[ ! -f ${REPO}/czechlight-lldp@2020-11-04.yang ]]; then
+ if compgen -G "${REPO}/czechlight-lldp@*.yang" >/dev/null; then
+ sysrepoctl --search-dirs /usr/share/lldp-systemd-networkd-sysrepo/yang --update /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp@2020-11-04.yang
+ else
+ sysrepoctl --search-dirs /usr/share/lldp-systemd-networkd-sysrepo/yang --install /usr/share/lldp-systemd-networkd-sysrepo/yang/czechlight-lldp@2020-11-04.yang
+ fi
sysrepoctl --change czechlight-lldp --permissions 0664 --apply
fi
diff --git a/submodules/cla-sysrepo b/submodules/cla-sysrepo
index 967df71..19163e5 160000
--- a/submodules/cla-sysrepo
+++ b/submodules/cla-sysrepo
@@ -1 +1 @@
-Subproject commit 967df712c39d1b4065a69da41c5682d4090aaa64
+Subproject commit 19163e50ab062a8b5b75f754b30c22fdbd62b03a
diff --git a/submodules/lldp-systemd-networkd-sysrepo b/submodules/lldp-systemd-networkd-sysrepo
index ea3e5f1..cd1efa0 160000
--- a/submodules/lldp-systemd-networkd-sysrepo
+++ b/submodules/lldp-systemd-networkd-sysrepo
@@ -1 +1 @@
-Subproject commit ea3e5f1fb2f05cf9c5a890c3ba3f99d35643e806
+Subproject commit cd1efa03ec0cb3d00d83c968664ec5848164d919
diff --git a/submodules/netconf-cli b/submodules/netconf-cli
index 43e12e7..2b33536 160000
--- a/submodules/netconf-cli
+++ b/submodules/netconf-cli
@@ -1 +1 @@
-Subproject commit 43e12e73d7c4231774b1f9ec08981aa0f3d7a65c
+Subproject commit 2b335365929b7ff823ca84057ad009bfcaef7d59
diff --git a/submodules/velia b/submodules/velia
index 6efb8ca..d208f3b 160000
--- a/submodules/velia
+++ b/submodules/velia
@@ -1 +1 @@
-Subproject commit 6efb8ca9ae45205a4a0f71855a64e45a47b0bfe4
+Subproject commit d208f3bfbd28e41880c3c688f1706ad0f95da2a0