From 23ec46bb8b78b7a4107f33f315dbad2b511b80d1 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 12 Oct 2022 13:08:57 -0400
Subject: [PATCH] Add vlanid to the vmware deployment support

---
 confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel     | 11 +++++++++++
 .../esxi7/profiles/hypervisor/scripts/makeksnet       |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
index de81f55e..8dc85db8 100644
--- a/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
+++ b/confluent_osdeploy/esxi7/initramfs/bin/dcuiweasel
@@ -8,6 +8,17 @@ if [ ! -f /var/run/vmware/show-esx-shell-login ]; then
 fi
 uuid=$(vsish -e get /hardware/bios/dmiInfo|grep -A15 UUID|sed -e 's/.*://'|sed -e ':a;N;$!ba;s/\n//g' | sed -e 's/ *0x//g')
 uuid=${uuid:0:8}-${uuid:8:4}-${uuid:12:4}-${uuid:16:4}-${uuid:20:12}
+kargs=$(vsish -e get /system/bootCmdLine|grep "command line:")
+vlanid=""
+for karg in $kargs; do
+    if [ ${karg%=*} = "vlanid" ]; then
+        vlanid=${karg/*=}
+    fi
+done
+if [ ! -z "$vlanid" ]; then
+    echo $vlanid > /tmp/confluent.vlanid
+    localcli network  vswitch standard portgroup set -p "Management Network" -v $vlanid
+fi
 mkdir -p /sys/devices/virtual/dmi/id/
 echo $uuid > /sys/devices/virtual/dmi/id/product_uuid
 mkdir -p /etc/confluent
diff --git a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet
index 9b2041fb..7d46a53e 100644
--- a/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet
+++ b/confluent_osdeploy/esxi7/profiles/hypervisor/scripts/makeksnet
@@ -52,4 +52,12 @@ if cfg['ipv4_method'] == 'static':
         netline += ' --gateway={0}'.format(cfg['ipv4_gateway'])
     if cfg['nameservers']:
         netline += ' --nameserver={0}'.format(cfg['nameservers'])
+vlanid = None
+try:
+    with open('/tmp/confluent.vlanid', 'r') as vlanin:
+        vlanid = vlanin.read()
+except Exception:
+    pass
+if vlanid:
+    netline += ' --vlanid={0}'.format(vlanid)
 print(netline)