From ae7d1188b352ababd4d1d33c78f016c302a4d6e4 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 4 Aug 2022 15:33:12 +0200
Subject: [PATCH] Fix flake8 errors in vCD connector

Change-Id: I51224b8103df1013d34f1f6daf886e59a8a94cc2
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 .../osm_rovim_vmware/vimconn_vmware.py        | 24 +++++++++----------
 ...errors_vcd_connector-439b3773f861015e.yaml | 21 ++++++++++++++++
 2 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/fix_flake8_errors_vcd_connector-439b3773f861015e.yaml

diff --git a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
index e06b2f91..a9bd0ff0 100644
--- a/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
+++ b/RO-VIM-vmware/osm_rovim_vmware/vimconn_vmware.py
@@ -5450,18 +5450,18 @@ class vimconnector(vimconn.VimConnector):
                     return None
 
                 if add_vdc_rest_url is not None and provider_vdc_ref is not None:
-                    data = """ <CreateVdcParams name="{0:s}" xmlns="http://www.vmware.com/vcloud/v1.5"><Description>{1:s}</Description>
-                            <AllocationModel>ReservationPool</AllocationModel>
-                            <ComputeCapacity><Cpu><Units>MHz</Units><Allocated>2048</Allocated><Limit>2048</Limit></Cpu>
-                            <Memory><Units>MB</Units><Allocated>2048</Allocated><Limit>2048</Limit></Memory>
-                            </ComputeCapacity><NicQuota>0</NicQuota><NetworkQuota>100</NetworkQuota>
-                            <VdcStorageProfile><Enabled>true</Enabled><Units>MB</Units><Limit>20480</Limit><Default>true</Default></VdcStorageProfile>
-                            <ProviderVdcReference
-                            name="Main Provider"
-                            href="{2:s}" />
-                    <UsesFastProvisioning>true</UsesFastProvisioning></CreateVdcParams>""".format(
-                        escape(vdc_name), escape(vdc_name), provider_vdc_ref
-                    )
+                    data = (
+                        ' <CreateVdcParams name="{0:s}" xmlns="http://www.vmware.com/vcloud/v1.5">'
+                        "<Description>{1:s}</Description>"
+                        "<AllocationModel>ReservationPool</AllocationModel>"
+                        "<ComputeCapacity><Cpu><Units>MHz</Units><Allocated>2048</Allocated><Limit>2048</Limit>"
+                        "</Cpu><Memory><Units>MB</Units><Allocated>2048</Allocated><Limit>2048</Limit></Memory>"
+                        "</ComputeCapacity><NicQuota>0</NicQuota><NetworkQuota>100</NetworkQuota>"
+                        "<VdcStorageProfile><Enabled>true</Enabled><Units>MB</Units><Limit>20480</Limit>"
+                        "<Default>true</Default></VdcStorageProfile>"
+                        '<ProviderVdcReference name="Main Provider" href="{2:s}" />'
+                        "<UsesFastProvisioning>true</UsesFastProvisioning></CreateVdcParams>"
+                    ).format(escape(vdc_name), escape(vdc_name), provider_vdc_ref)
                     headers[
                         "Content-Type"
                     ] = "application/vnd.vmware.admin.createVdcParams+xml"
diff --git a/releasenotes/notes/fix_flake8_errors_vcd_connector-439b3773f861015e.yaml b/releasenotes/notes/fix_flake8_errors_vcd_connector-439b3773f861015e.yaml
new file mode 100644
index 00000000..20888aa4
--- /dev/null
+++ b/releasenotes/notes/fix_flake8_errors_vcd_connector-439b3773f861015e.yaml
@@ -0,0 +1,21 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
+---
+fixes:
+  - |
+    This change fixes flake8 errors in vCD connector files, hidden in previous
+    execution of flake8 tests.
-- 
2.17.1