Add distributedvirtualportgroup support

'distributedvirtualportgroup' configuration takes precedence over 'network'. Closes: snobear#28, snobear#55
michaelw · Jul 22, 2016 · 1e8fa14 · 1e8fa14
1 parent 3dcadbf
commit 1e8fa14
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/ezmomi/config/config.yml.example b/ezmomi/config/config.yml.example
@@ -37,6 +37,13 @@ networks:
     network:    'Internal 2'
     gateway:    '192.168.24.50'
 
+  '192.168.24.60/24':
+    datacenter:                  'Foocenter'
+    cluster:                     'FooCluster'
+    datastore:                   'Foomount'
+    distributedvirtualportgroup: 'DVInternal'
+    gateway:                     '192.168.24.61'
+
   # storage network
   # Note: any networks that not used for primary IPs only need to have the network name defined, like this example.
   '172.20.200.1/24':

diff --git a/ezmomi/ezmomi.py b/ezmomi/ezmomi.py
@@ -290,15 +290,27 @@ def clone(self):
             nic.device.key = 4000
             nic.device.deviceInfo = vim.Description()
             nic.device.deviceInfo.label = 'Network Adapter %s' % (key + 1)
-            nic.device.deviceInfo.summary = ip_settings[key]['network']
-            nic.device.backing = (
-                vim.vm.device.VirtualEthernetCard.NetworkBackingInfo()
-            )
-            nic.device.backing.network = (
-                self.get_obj([vim.Network], ip_settings[key]['network'])
-            )
-            nic.device.backing.deviceName = ip_settings[key]['network']
-            nic.device.backing.useAutoDetect = False
+
+            if ip_settings[key].has_key('distributedvirtualportgroup'):
+                dvpg = ip_settings[key]['distributedvirtualportgroup']
+                nic.device.deviceInfo.summary = dvpg
+                pg_obj = self.get_obj([vim.dvs.DistributedVirtualPortgroup], dvpg)  # noqa
+                dvs_port_connection = vim.dvs.PortConnection()
+                dvs_port_connection.portgroupKey = pg_obj.key
+                dvs_port_connection.switchUuid = pg_obj.config.distributedVirtualSwitch.uuid  # noqa
+                nic.device.backing = vim.vm.device.VirtualEthernetCard.DistributedVirtualPortBackingInfo()  # noqa
+                nic.device.backing.port = dvs_port_connection
+            else:
+                # use traditional network-setup without distributed switches
+                nic.device.deviceInfo.summary = ip_settings[key]['network']
+                nic.device.backing = (
+                    vim.vm.device.VirtualEthernetCard.NetworkBackingInfo()
+                )
+                nic.device.backing.network = (
+                    self.get_obj([vim.Network], ip_settings[key]['network'])
+                )
+                nic.device.backing.deviceName = ip_settings[key]['network']
+                nic.device.backing.useAutoDetect = False
             nic.device.connectable = vim.vm.device.VirtualDevice.ConnectInfo()
             nic.device.connectable.startConnected = True
             nic.device.connectable.allowGuestControl = True