feat: add boolean "qinq" option to network interface spec

If present and true, the `qinq` option will be added to the interface network specification string in the minimega config.
sandialabs · Jun 28, 2023 · ac545d0 · ac545d0
1 parent 6b5c322
commit ac545d0
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 4 deletions.
diff --git a/src/go/tmpl/templates/linux_interfaces.tmpl b/src/go/tmpl/templates/linux_interfaces.tmpl
@@ -10,7 +10,7 @@ if command -v 'ip' &>/dev/null; then
     ip link set dev "$dev" down
     ip addr flush dev "$dev"
 
-    {{ if eq $iface.Proto "manual" }}
+    {{ if or ($iface.QinQ) (eq $iface.Proto "manual") }}
     ip link set dev "$dev" up
     {{ else if eq $iface.Proto "dhcp" }}
     ip link set dev "$dev" up
@@ -35,7 +35,7 @@ else
     dev=$(ifconfig -s -a | grep -ivE '^lo|Iface' | awk 'NR=={{ addInt $idx 1 }} { print $1 }')
     ifconfig "$dev" down
 
-    {{ if eq $iface.Proto "manual" }}
+    {{ if or ($iface.QinQ) (eq $iface.Proto "manual") }}
     ifconfig "$dev" up
     {{ else if eq $iface.Proto "dhcp" }}
     ifconfig "$dev" up

diff --git a/src/go/tmpl/templates/windows_startup.tmpl b/src/go/tmpl/templates/windows_startup.tmpl
@@ -72,7 +72,7 @@ Do {
 } While ($wmi -eq $null)
 {{ $length := len .Node.Network.Interfaces }}
 {{ range $idx, $iface := .Node.Network.Interfaces }}
-    {{ if eq $iface.Proto "static" }}
+    {{ if and (eq $iface.Proto "static") (not $iface.QinQ) }}
 Do {
         {{ if gt $length 1 }}
     $status = $wmi[{{ $idx }}].EnableStatic('{{ $iface.Address }}', '{{ $iface.NetworkMask }}')

diff --git a/src/go/types/interfaces/topology.go b/src/go/types/interfaces/topology.go
@@ -110,6 +110,7 @@ type NodeNetworkInterface interface {
 	Mask() int
 	Gateway() string
 	DNS() []string
+	QinQ() bool
 	RulesetIn() string
 	RulesetOut() string
 
@@ -128,6 +129,7 @@ type NodeNetworkInterface interface {
 	SetMask(int)
 	SetGateway(string)
 	SetDNS([]string)
+	SetQinQ(bool)
 	SetRulesetIn(string)
 	SetRulesetOut(string)
 }

diff --git a/src/go/types/version/v0/network.go b/src/go/types/version/v0/network.go
@@ -94,6 +94,7 @@ type Interface struct {
 	MaskF       int      `json:"mask" yaml:"mask" structs:"mask" mapstructure:"mask"`
 	GatewayF    string   `json:"gateway" yaml:"gateway" structs:"gateway" mapstructure:"gateway"`
 	DNSF        []string `json:"dns" yaml:"dns" structs:"dns" mapstructure:"dns"`
+	QinQF       bool     `json:"qinq" yaml:"qinq" structs:"qinq" mapstructure:"qinq"`
 	RulesetInF  string   `json:"ruleset_in" yaml:"ruleset_in" structs:"ruleset_in" mapstructure:"ruleset_in"`
 	RulesetOutF string   `json:"ruleset_out" yaml:"ruleset_out" structs:"ruleset_out" mapstructure:"ruleset_out"`
 }
@@ -162,6 +163,10 @@ func (this Interface) DNS() []string {
 	return this.DNSF
 }
 
+func (this Interface) QinQ() bool {
+	return this.QinQF
+}
+
 func (this Interface) RulesetIn() string {
 	return this.RulesetInF
 }
@@ -230,6 +235,10 @@ func (this *Interface) SetDNS(dns []string) {
 	this.DNSF = dns
 }
 
+func (this *Interface) SetQinQ(q bool) {
+	this.QinQF = q
+}
+
 func (this *Interface) SetRulesetIn(rule string) {
 	this.RulesetInF = rule
 }
@@ -480,6 +489,10 @@ func (this Network) InterfaceConfig() string {
 			config = append(config, iface.DriverF)
 		}
 
+		if iface.QinQF {
+			config = append(config, "qinq")
+		}
+
 		configs[i] = strings.Join(config, ",")
 	}
 

diff --git a/src/go/types/version/v1/network.go b/src/go/types/version/v1/network.go
@@ -127,6 +127,7 @@ type Interface struct {
 	MaskF       int      `json:"mask" yaml:"mask" structs:"mask" mapstructure:"mask"`
 	GatewayF    string   `json:"gateway" yaml:"gateway" structs:"gateway" mapstructure:"gateway"`
 	DNSF        []string `json:"dns" yaml:"dns" structs:"dns" mapstructure:"dns"`
+	QinQF       bool     `json:"qinq" yaml:"qinq" structs:"qinq" mapstructure:"qinq"`
 	RulesetInF  string   `json:"ruleset_in" yaml:"ruleset_in" structs:"ruleset_in" mapstructure:"ruleset_in"`
 	RulesetOutF string   `json:"ruleset_out" yaml:"ruleset_out" structs:"ruleset_out" mapstructure:"ruleset_out"`
 }
@@ -195,6 +196,10 @@ func (this Interface) DNS() []string {
 	return this.DNSF
 }
 
+func (this Interface) QinQ() bool {
+	return this.QinQF
+}
+
 func (this Interface) RulesetIn() string {
 	return this.RulesetInF
 }
@@ -263,6 +268,10 @@ func (this *Interface) SetDNS(dns []string) {
 	this.DNSF = dns
 }
 
+func (this *Interface) SetQinQ(q bool) {
+	this.QinQF = q
+}
+
 func (this *Interface) SetRulesetIn(rule string) {
 	this.RulesetInF = rule
 }
@@ -539,6 +548,10 @@ func (this Network) InterfaceConfig() string {
 			config = append(config, iface.DriverF)
 		}
 
+		if iface.QinQF {
+			config = append(config, "qinq")
+		}
+
 		configs[i] = strings.Join(config, ",")
 	}
 

diff --git a/src/go/types/version/v1/schema.go b/src/go/types/version/v1/schema.go
@@ -551,6 +551,9 @@ components:
         driver:
           type: string
           example: e1000
+        qinq:
+          type: boolean
+          default: false
     iface_address:
       type: object
       required:

diff --git a/src/go/types/version/v2/schema.go b/src/go/types/version/v2/schema.go
@@ -577,6 +577,9 @@ components:
         driver:
           type: string
           example: e1000
+        qinq:
+          type: boolean
+          default: false
     iface_address:
       type: object
       required:

diff --git a/src/go/web/public/grapheditor/utils/schemas/kvm_schema.json b/src/go/web/public/grapheditor/utils/schemas/kvm_schema.json
@@ -765,7 +765,8 @@
               "type": "string",
               "title": "proto",
               "enum": [
-                "dhcp"
+                "dhcp",
+                "manual"
               ],
               "default": "dhcp",
               "examples": [
@@ -919,6 +920,11 @@
           "examples": [
             "e1000"
           ]
+        },
+        "qinq": {
+          "type": "boolean",
+          "title": "qinq",
+          "default": false
         }
       },
       "required": [