From: beierl <mbeierl@vmware.com>
Date: Fri, 29 Nov 2019 19:03:21 +0000 (-0500)
Subject: Fixing Python3
X-Git-Tag: v7.0.0rc1~18
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F8272%2F2;p=osm%2Fdevops.git

Fixing Python3

Syntax was still python2 only.

Change-Id: Ie378662686ddf49c0a31cd46ea0e660cc00c7604
Signed-off-by: beierl <mbeierl@vmware.com>
---

diff --git a/tools/OVF_converter/converter.py b/tools/OVF_converter/converter.py
index 5f31ed36..8c689477 100644
--- a/tools/OVF_converter/converter.py
+++ b/tools/OVF_converter/converter.py
@@ -464,7 +464,7 @@ class OVFConverter(object):
         disk_controller_info = self.__read_yaml_file(DISK_CONTROLLER_INFO_FILE_PATH)
         try:
             if self.disk_controller and disk_controller_info:
-                for key, value in disk_controller_info.iteritems():
+                for key, value in disk_controller_info.items():
                     if self.disk_controller.lower() in key.lower():
                         disk_controller['controllerName'] = key
                         disk_controller['resourceType'] = str(value["ResourceType"])
diff --git a/tools/OVF_converter/ovf_template/template.xml b/tools/OVF_converter/ovf_template/template.xml
index a963582f..6382cefe 100644
--- a/tools/OVF_converter/ovf_template/template.xml
+++ b/tools/OVF_converter/ovf_template/template.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  Copyright 2016-2019 VMware Inc.
  This file is part of ETSI OSM
@@ -18,7 +19,6 @@
  For those usages not covered by the Apache License, Version 2.0 please
  contact:  osslegalrouting@vmware.com
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1" xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common" xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1" xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData" xmlns:vmw="http://www.vmware.com/schema/ovf" xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <References>
      <File ovf:href="disk_img_filename.vmdk" ovf:id="file1" />
@@ -30,9 +30,9 @@
 
   <NetworkSection>
     <Info>List of logical networks used in the package</Info>
- </NetworkSection>
+  </NetworkSection>
 
- <VirtualSystem ovf:id="vm">
+  <VirtualSystem ovf:id="vm">
     <Info>A virtual machine</Info>
     <Name>Virtual machine name</Name>