From a0df6222dcf9a8d2a2d6f02b28ede4858d3a5c17 Mon Sep 17 00:00:00 2001
From: Kim Hagen <khagen@multi-development.com>
Date: Fri, 6 Feb 2015 10:24:58 +0100
Subject: Can not change EtherType with vif-c interfaces configured

---
 .../interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def  | 7 ++++++-
 .../interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def | 7 ++++++-
 .../pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def     | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
index e8a1e810..a79acae4 100644
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
+++ b/templates/interfaces/bonding/node.tag/vif-s/node.tag/ethertype/node.def
@@ -7,7 +7,12 @@ comp_help: possible completions:
   0x88A8             802.1AD
   0x8100             802.1Q
 
-update: ETHERTYPE=`echo "$VAR(@)"`
+update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces bonding $VAR(../../@) vif-s $VAR(../@) ethertype`
+	if [ ! -z $VAR(../vif-c/@@) ] && [ ! -z $ACTIVEETHTYPE ]
+		then echo "Can not change ethertype with vif-c configured"
+		exit 1
+	fi
+	ETHERTYPE=`echo "$VAR(@)"`
 	if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
 	if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
 	read -a SLAVES </sys/class/net/$VAR(../../@)/bonding/slaves
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def
index 9a3615be..0a5e954a 100644
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def
@@ -7,7 +7,12 @@ comp_help: possible completions:
   0x88A8             802.1AD
   0x8100             802.1Q
 
-update: ETHERTYPE=`echo "$VAR(@)"`
+update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces ethernet $VAR(../../@) vif-s $VAR(../@) ethertype`
+	if [ ! -z $VAR(../vif-c/@@) ] && [ ! -z $ACTIVEETHTYPE ]
+		then echo "Can not change ethertype with vif-c configured"
+		exit 1
+	fi
+	ETHERTYPE=`echo "$VAR(@)"`
 	if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
 	if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
 	ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def
index 54ff166c..9e2d5a54 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def
@@ -7,7 +7,12 @@ comp_help: possible completions:
   0x88A8             802.1AD
   0x8100             802.1Q
 
-update: ETHERTYPE=`echo "$VAR(@)"`
+update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces pseudo-ethernet $VAR(../../@) vif-s $VAR(../@) ethertype`
+	if [ ! -z $VAR(../vif-c/@@) ] && [ ! -z $ACTIVEETHTYPE ]
+		then echo "Can not change ethertype with vif-c configured"
+		exit 1
+	fi
+	ETHERTYPE=`echo "$VAR(@)"`
         if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
         if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
         ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1
-- 
cgit v1.2.3