X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-vmware%2Fosm_rovim_vmware%2Fvimconn_vmware.py;h=b0a6ed387ec479b0938ae14cc61095d5bfee1080;hb=e1aa8060f6eec32676a93d6acea886cdad703eb4;hp=a3c25ca019000ee2183aaf43652d61fc1767f7c0;hpb=80135b928ab442c38898750b4751480205b4affc;p=osm%2FRO.git
diff --git a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
index a3c25ca0..b0a6ed38 100644
--- a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
+++ b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
@@ -25,26 +25,13 @@
vimconn_vmware implementation an Abstract class in order to interact with VMware vCloud Director.
"""
-from lxml import etree as lxmlElementTree
-from osm_ro_plugin import vimconn
-from progressbar import Percentage, Bar, ETA, FileTransferSpeed, ProgressBar
-from pyVim.connect import SmartConnect, Disconnect
-from pyVmomi import vim, vmodl # @UnresolvedImport
-from pyvcloud.vcd.client import BasicLoginCredentials, Client
-from pyvcloud.vcd.org import Org
-from pyvcloud.vcd.vapp import VApp
-from pyvcloud.vcd.vdc import VDC
-from xml.etree import ElementTree as XmlElementTree
-from xml.sax.saxutils import escape
import atexit
import hashlib
import json
import logging
-import netaddr
import os
import random
import re
-import requests
import shutil
import socket
import ssl
@@ -54,6 +41,20 @@ import tempfile
import time
import traceback
import uuid
+from xml.etree import ElementTree as XmlElementTree
+from xml.sax.saxutils import escape
+
+from lxml import etree as lxmlElementTree
+import netaddr
+from osm_ro_plugin import vimconn
+from progressbar import Bar, ETA, FileTransferSpeed, Percentage, ProgressBar
+from pyvcloud.vcd.client import BasicLoginCredentials, Client
+from pyvcloud.vcd.org import Org
+from pyvcloud.vcd.vapp import VApp
+from pyvcloud.vcd.vdc import VDC
+from pyVim.connect import Disconnect, SmartConnect
+from pyVmomi import vim, vmodl # @UnresolvedImport
+import requests
import yaml
# global variable for vcd connector type
@@ -1906,6 +1907,7 @@ class vimconnector(vimconn.VimConnector):
start=False,
image_id=None,
flavor_id=None,
+ affinity_group_list=[],
net_list=[],
cloud_config=None,
disk_list=None,
@@ -5456,18 +5458,18 @@ class vimconnector(vimconn.VimConnector):
return None
if add_vdc_rest_url is not None and provider_vdc_ref is not None:
- data = """ {1:s}
- ReservationPool
- MHz20482048
- MB20482048
- 0100
- trueMB20480true
-
- true""".format(
- escape(vdc_name), escape(vdc_name), provider_vdc_ref
- )
+ data = (
+ ' '
+ "{1:s}"
+ "ReservationPool"
+ "MHz20482048"
+ "MB20482048"
+ "0100"
+ "trueMB20480"
+ "true"
+ ''
+ "true"
+ ).format(escape(vdc_name), escape(vdc_name), provider_vdc_ref)
headers[
"Content-Type"
] = "application/vnd.vmware.admin.createVdcParams+xml"
@@ -6229,7 +6231,7 @@ class vimconnector(vimconn.VimConnector):
)
return None
- deviceId = hex(host_pci_dev.deviceId % 2 ** 16).lstrip("0x")
+ deviceId = hex(host_pci_dev.deviceId % 2**16).lstrip("0x")
backing = vim.VirtualPCIPassthroughDeviceBackingInfo(
deviceId=deviceId,
id=host_pci_dev.id,
@@ -7492,13 +7494,10 @@ if [ "$1" = "precustomization" ];then
for device in devices:
if type(device) is vim.vm.device.VirtualDisk:
- if (
- isinstance(
- device.backing,
- vim.vm.device.VirtualDisk.FlatVer2BackingInfo,
- )
- and hasattr(device.backing, "fileName")
- ):
+ if isinstance(
+ device.backing,
+ vim.vm.device.VirtualDisk.FlatVer2BackingInfo,
+ ) and hasattr(device.backing, "fileName"):
disk_info["full_path"] = device.backing.fileName
disk_info["datastore"] = device.backing.datastore
disk_info["capacityKB"] = device.capacityInKB