apache · davidjumani · Dec 14, 2020 · Dec 14, 2020 · Dec 14, 2020 · Nov 26, 2020
diff --git a/.python-version b/.python-version
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,7 @@ jdk:
   - openjdk11
 
 python:
-  - "2.7"
+  - "3.9"
 
 node_js:
   - 12

diff --git a/debian/cloudstack-marvin.postinst b/debian/cloudstack-marvin.postinst
@@ -19,5 +19,5 @@
 
 set -e
 
-pip install --upgrade http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df
-pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+python3 -m pip install --upgrade pip
+python3 -m pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
diff --git a/debian/control b/debian/control
@@ -49,7 +49,7 @@ Description: The CloudStack documentation
 
 Package: cloudstack-marvin
 Architecture: all
-Depends: ${misc:Depends}, python-pip, python-dev, libffi-dev
+Depends: ${misc:Depends}, python3-pip, python3-dev, libffi-dev
 Description: The CloudStack Marvin library
 
 Package: cloudstack-integration-tests

diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
@@ -48,6 +48,9 @@ BuildRequires: /usr/bin/mkisofs
 BuildRequires: mysql-connector-python
 BuildRequires: maven => 3.0.0
 BuildRequires: python-setuptools
+BuildRequires: python3
+BuildRequires: python3-pip
+BuildRequires: python3-setuptools
 BuildRequires: wget
 BuildRequires: nodejs
 
@@ -153,6 +156,9 @@ Apache CloudStack command line interface
 
 %package marvin
 Summary: Apache CloudStack Marvin library
+Requires: python3
+Requires: python3-devel
+Requires: python3-pip
 Requires: python-pip
 Requires: gcc
 Requires: python-devel
@@ -418,6 +424,8 @@ fi
 # Install mysql-connector-python
 pip3 install %{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl %{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl %{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
 
+pip3 install urllib3
+
 /usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true
 
 grep -s -q "db.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e "\$adb.cloud.driver=jdbc:mysql" "%{_sysconfdir}/%{name}/management/db.properties"
@@ -506,6 +514,9 @@ fi
 %post marvin
 pip install --upgrade https://files.pythonhosted.org/packages/ca/ea/1e2553b088bad2f9fa8120c2624f797b2d7450d3b61bb492d29c72e3d3c2/mysql_connector_python-8.0.20-cp27-cp27mu-manylinux1_x86_64.whl
 pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade nose
+pip3 install --upgrade urllib3
 
 #No default permission as the permission setup is complex
 %files management

diff --git a/pom.xml b/pom.xml
@@ -974,6 +974,7 @@
                             <exclude>**/*.md</exclude>
                             <exclude>.java-version</exclude>
                             <exclude>.python-version</exclude>
+                            <exclude>systemvm/.pythen-version</exclude>
                             <exclude>.idea/</exclude>
                             <exclude>.metadata/**</exclude>
                             <exclude>.git/**</exclude>

diff --git a/systemvm/test/runtests.sh b/systemvm/test/runtests.sh
@@ -18,27 +18,34 @@
 
 # requires netaddr
 
+which python2
+python2 --version
+
+sudo python2 -m pip install --user --upgrade pycodestyle
+
 export PYTHONPATH="../debian/opt/cloud/bin/"
 export PYTHONDONTWRITEBYTECODE=False
 
 echo "Running pycodestyle to check systemvm/python code for errors"
-pycodestyle --max-line-length=179 *py
-pycodestyle --max-line-length=179 --exclude=monitorServices.py,baremetal-vr.py,passwd_server_ip.py `find ../debian -name \*.py`
+python2 -m pycodestyle --max-line-length=179 *py
+python2 -m pycodestyle --max-line-length=179 --exclude=monitorServices.py,baremetal-vr.py,passwd_server_ip.py `find ../debian -name \*.py`
 if [ $? -gt 0 ]
 then
     echo "pycodestyle failed, please check your code"
     exit 1
 fi
 
 echo "Running pylint to check systemvm/python code for errors"
-pylint --disable=R,C,W *.py
-pylint --disable=R,C,W `find ../debian -name \*.py`
+python2 --version
+pylint --version
+pylint --disable=R,C,W,E *.py
+pylint --disable=R,C,W,E `find ../debian -name \*.py`
 if [ $? -gt 0 ]
 then
     echo "pylint failed, please check your code"
     exit 1
 fi
 
 echo "Running systemvm/python unit tests"
-nosetests .
+nosetests2.7 .
 exit $?
diff --git a/test/integration/component/cpu_limits/__init__.py b/test/integration/component/cpu_limits/__init__.py
@@ -13,4 +13,4 @@
 # "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.
+# under the License.
diff --git a/test/integration/component/find_hosts_for_migration.py b/test/integration/component/find_hosts_for_migration.py
@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (migrateVirtualMachine,
                                   prepareHostForMaintenance,
                                   cancelHostMaintenance,
@@ -270,4 +271,4 @@ def test_01_find_hosts_for_migration(self):
 
         self.assertTrue(notSuitableHost is not None, "notsuitablehost should not be None")
         self.debug("Suitable Hosts: %s" % suitableHost)
-        self.debug("Not suitable Hosts: %s" % notSuitableHost)
+        self.debug("Not suitable Hosts: %s" % notSuitableHost)
diff --git a/test/integration/component/maint/__init__.py b/test/integration/component/maint/__init__.py
@@ -18,4 +18,4 @@
 """
 Tests that put hosts, zones, resources in to maintenance mode are here.
 These will have to be run sequentiall when resources are available so as not disrupt other tests
-"""
+"""
diff --git a/test/integration/component/maint/test_bugs.py b/test/integration/component/maint/test_bugs.py
@@ -16,7 +16,8 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (updateStoragePool,
                                   resizeVolume,
                                   listCapacity,

diff --git a/test/integration/component/maint/test_capacity_host_delete.py b/test/integration/component/maint/test_capacity_host_delete.py
@@ -18,7 +18,8 @@
 # Test from the Marvin - Testing in Python wiki
 
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 # Import Integration Libraries
 

diff --git a/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py b/test/integration/component/maint/test_dedicate_guest_vlan_ranges.py
@@ -24,7 +24,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               cleanup_resources,
                               random_gen,

diff --git a/test/integration/component/maint/test_dedicate_public_ip_range.py b/test/integration/component/maint/test_dedicate_public_ip_range.py
@@ -26,7 +26,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import (validateList,
                               cleanup_resources,
                               random_gen)

diff --git a/test/integration/component/maint/test_escalation_templates.py b/test/integration/component/maint/test_escalation_templates.py
@@ -15,7 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (Account,
                              Domain, Template, Configurations,VirtualMachine,Snapshot,ServiceOffering
                              )
@@ -161,7 +162,7 @@ def test_01_CS40139_listtemplate_with_different_pagesize(self):
             account=self.account.name,
             domainid=self.account.domainid)
         status = validateList(listfirst500template)
-        self.assertEquals(
+        self.assertEqual(
                 PASS,
                 status[0],
                 "First 500 template list is empty")
@@ -173,7 +174,7 @@ def test_01_CS40139_listtemplate_with_different_pagesize(self):
             account=self.account.name,
             domainid=self.account.domainid)
         status = validateList(listremainingtemplate)
-        self.assertEquals(
+        self.assertEqual(
                 PASS,
                 status[0],
                 "Next 500 template list is empty")
@@ -185,7 +186,7 @@ def test_01_CS40139_listtemplate_with_different_pagesize(self):
             account=self.account.name,
             domainid=self.account.domainid)
         status = validateList(listalltemplate)
-        self.assertEquals(
+        self.assertEqual(
                 PASS,
                 status[0],
                 "entire template list is empty")
@@ -253,7 +254,7 @@ def test_02_template_permissions(self):
             )
             self.updateConfigurAndRestart("allow.public.user.templates", "true")
             self.fail("Template creation passed for user")
-        except CloudstackAPIException  as e:
+        except CloudstackAPIException as e:
             self.assertRaises("Exception Raised : %s" % e)
         # Register new public template as domain admin
         # Exception should be raised for registering public template
@@ -268,7 +269,7 @@ def test_02_template_permissions(self):
             )
             self.updateConfigurAndRestart("allow.public.user.templates", "true")
             self.fail("Template creation passed for domain admin")
-        except CloudstackAPIException  as e:
+        except CloudstackAPIException as e:
             self.assertRaises("Exception Raised : %s" % e)
 
         if self.hypervisor.lower() in ['hyperv', 'lxc']:
@@ -314,7 +315,7 @@ def test_02_template_permissions(self):
                 )
                 self.updateConfigurAndRestart("allow.public.user.templates", "true")
                 self.fail("Template creation passed from snapshot for domain user")
-            except CloudstackAPIException  as e:
+            except CloudstackAPIException as e:
                 self.assertRaises("Exception Raised : %s" % e)
 
             VirtualMachine.stop(user_vm_created, self.user_api_client)
@@ -324,7 +325,7 @@ def test_02_template_permissions(self):
                 domainid=user_account.domainid,
                 state="Stopped")
             status = validateList(list_stopped_vms_after)
-            self.assertEquals(
+            self.assertEqual(
                 PASS,
                 status[0],
                 "Stopped VM is not in Stopped state"
@@ -336,7 +337,7 @@ def test_02_template_permissions(self):
                 )
                 self.updateConfigurAndRestart("allow.public.user.templates", "true")
                 self.fail("Template creation passed from volume for domain user")
-            except CloudstackAPIException  as e:
+            except CloudstackAPIException as e:
                 self.assertRaises("Exception Raised : %s" % e)
 
             admin_vm_created = VirtualMachine.create(
@@ -378,7 +379,7 @@ def test_02_template_permissions(self):
                 )
                 self.updateConfigurAndRestart("allow.public.user.templates", "true")
                 self.fail("Template creation passed from snapshot for domain admin")
-            except CloudstackAPIException  as e:
+            except CloudstackAPIException as e:
                 self.assertRaises("Exception Raised : %s" % e)
 
             VirtualMachine.stop(admin_vm_created, self.admin_api_client)
@@ -388,7 +389,7 @@ def test_02_template_permissions(self):
                 domainid=self.account.domainid,
                 state="Stopped")
             status = validateList(list_stopped_vms_after)
-            self.assertEquals(
+            self.assertEqual(
                 PASS,
                 status[0],
                 "Stopped VM is not in Stopped state"
@@ -400,7 +401,7 @@ def test_02_template_permissions(self):
                 )
                 self.updateConfigurAndRestart("allow.public.user.templates", "true")
                 self.fail("Template creation passed from volume for domain admin")
-            except CloudstackAPIException  as e:
+            except CloudstackAPIException as e:
                 self.assertRaises("Exception Raised : %s" % e)
 
             self.updateConfigurAndRestart("allow.public.user.templates", "true")

diff --git a/test/integration/component/maint/test_escalations_hosts.py b/test/integration/component/maint/test_escalations_hosts.py
@@ -18,7 +18,8 @@
 # Test from the Marvin - Testing in Python wiki
 
 # All tests inherit from cloudstackTestCase
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 
 # Import Integration Libraries
 

diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py
@@ -20,7 +20,8 @@
 """
 # Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (prepareHostForMaintenance,
                                   cancelHostMaintenance)
 from marvin.lib.utils import cleanup_resources

diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py
@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import (migrateVirtualMachine,
                                   prepareHostForMaintenance,
                                   cancelHostMaintenance)

diff --git a/test/integration/component/maint/test_ip_resource_count_for_vpc.py b/test/integration/component/maint/test_ip_resource_count_for_vpc.py
@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.base import (VirtualMachine,
                              NetworkOffering,
                              VpcOffering,

diff --git a/test/integration/component/maint/test_multiple_ip_ranges.py b/test/integration/component/maint/test_multiple_ip_ranges.py
@@ -16,7 +16,8 @@
 # under the License.
 """ Tests for Multiple IP Ranges feature
 """
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources, get_process_status
 from marvin.lib.base import (Account,
                              DiskOffering,
@@ -203,11 +204,11 @@ def setUp(self):
         )
         self.ip_range = list(
             netaddr.iter_iprange(
-                unicode(
-                    self.testdata["vlan_ip_range"]["startip"]), unicode(
+                str(
+                    self.testdata["vlan_ip_range"]["startip"]), str(
                     self.testdata["vlan_ip_range"]["endip"])))
         self.nic_ip = netaddr.IPAddress(
-            unicode(
+            str(
                 self.vm_response[0].nic[0].ipaddress))
         self.debug("vm got {} as ip address".format(self.nic_ip))
         self.assertIn(
@@ -281,11 +282,11 @@ def test_01_deploy_vm_in_new_cidr(self):
         """
         self.ip_range = list(
             netaddr.iter_iprange(
-                unicode(
-                    self.testdata["vlan_ip_range"]["startip"]), unicode(
+                str(
+                    self.testdata["vlan_ip_range"]["startip"]), str(
                     self.testdata["vlan_ip_range"]["endip"])))
         self.nic_ip = netaddr.IPAddress(
-            unicode(
+            str(
                 self.vm_response[0].nic[0].ipaddress))
         self.debug("vm got {} as ip address".format(self.nic_ip))
         self.assertIn(

diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -19,7 +19,8 @@
 """
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.cloudstackAPI import migrateSystemVm
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Host,

diff --git a/test/integration/component/maint/test_vpc_on_host_maintenance.py b/test/integration/component/maint/test_vpc_on_host_maintenance.py
@@ -16,7 +16,8 @@
 # under the License.
 
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.cloudstackTestCase import cloudstackTestCase
+import unittest
 from marvin.lib.utils import cleanup_resources
 from marvin.lib.base import (Account,
                              Host,
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ jdk: @@
       - openjdk11
     python:
-      - "2.7"
+      - "3.9"
     node_js:
       - 12
@@ Expand Down @@