From 1e44fa3719d5eff9f969ae4c86f453618f8b569c Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sat, 21 Oct 2023 10:15:31 +0200
Subject: [PATCH] Test: optimization of vagrant git yangmodels handling

---
 test/vagrant/vagrant.sh | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/test/vagrant/vagrant.sh b/test/vagrant/vagrant.sh
index a1c060e5..8bd1fedf 100755
--- a/test/vagrant/vagrant.sh
+++ b/test/vagrant/vagrant.sh
@@ -279,7 +279,17 @@ $scpcmd ./clixon.sh vagrant@127.0.0.1:
 $sshcmd ./clixon.sh $release $wwwuser ${with_restconf}
 
 # Tests require yangmodels and openconfig
-cat<<EOF > $dir/yangmodels.sh
+if [ -d /usr/local/share/yang/standard ]; then
+    $scpcmd -r /usr/local/share/yang/standard/ vagrant@127.0.0.1:
+
+    cat<<EOF > $dir/yangmodels.sh
+set -eux
+rm -rf /usr/local/share/yang
+mkdir /usr/local/share/yang
+mv standard /usr/local/share/yang/
+EOF
+else
+    cat<<EOF > $dir/yangmodels.sh
 set -eux
 cd /usr/local/share
 rm -rf yang
@@ -295,6 +305,22 @@ git pull origin main
 # Patch yang syntax errors
 sed  s/=\ olt\'/=\ \'olt\'/g /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang > ieee802-ethernet-pon2.yang
 mv ieee802-ethernet-pon2.yang /usr/local/share/yang/standard/ieee/published/802.3/ieee802-ethernet-pon.yang
+EOF
+fi
+chmod 755 $dir/yangmodels.sh
+$scpcmd $dir/yangmodels.sh vagrant@127.0.0.1:
+$sshcmd sudo ./yangmodels.sh
+
+if [ -d /usr/local/share/openconfig ]; then
+    $scpcmd -r /usr/local/share/openconfig vagrant@127.0.0.1:
+    cat<<EOF > $dir/openconfig.sh
+set -eux
+rm -rf /usr/local/share/openconfig
+mkdir /usr/local/share/openconfig
+mv openconfig /usr/local/share/
+EOF
+else
+    cat<<EOF > $dir/openconfig.sh
 # openconfig
 cd /usr/local/share
 rm -rf openconfig
@@ -302,10 +328,10 @@ mkdir openconfig
 cd openconfig
 git clone https://github.com/openconfig/public
 EOF
-chmod 755 $dir/yangmodels.sh
-$scpcmd $dir/yangmodels.sh vagrant@127.0.0.1:
-$sshcmd sudo ./yangmodels.sh
-
+fi
+chmod 755 $dir/openconfig.sh
+$scpcmd $dir/openconfig.sh vagrant@127.0.0.1:
+$sshcmd sudo ./openconfig.sh
 
 # Run tests
 $sshcmd "(cd src/cligen/test; ./sum.sh)"