marvin_refactor: CLOUDSTACK-4591 - switch to unittest2

Switch marvin to unittest2 so as to support multiple python versions

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

tools/marvin/marvin/TestCaseExecuteEngine.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import unittest
+import unittest2 as unittest
 import os
 import sys
 import logging

tools/marvin/marvin/cloudstackTestCase.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import unittest
+import unittest2 as unittest
 
 
 def user(Name, DomainName, AcctType):

tools/marvin/marvin/factory/data/vm.py

@@ -39,19 +39,10 @@ class VirtualMachineWithStaticNat(VirtualMachineFactory):
             domainid=self.domainid,
             zoneid=self.zoneid,
         )
-        ssh_fwrule = SshFirewallRule(
-            apiclient=self.apiclient,
-            ipaddressid=ipassoc.id
-        )
-        ntwks = Network.list(
-            apiclient=self.apiclient,
-            account=self.account,
-            domainid=self.domainid,
-        )
-        ntwks[0].enableStaticNat(
+        ipassoc.enableStaticNat(
             apiclient=self.apiclient,
             ipaddressid=ipassoc.id,
-            virtualmachineid=self.id,
+            virtualmachineid=self.id
         )
         self.ssh_ip = ipassoc.ipaddress
         self.public_ip = ipassoc.ipaddress

tools/marvin/marvin/sandbox/testSetupSuccess.py

@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import marvin
-import unittest
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from time import sleep as delay

tools/marvin/marvin/test/test_factories.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import unittest
+import unittest2 as unittest
 import logging
 from nose.plugins.attrib import attr
 from should_dsl import should, should_not

tools/marvin/marvin/testSetupSuccess.py

@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import marvin
-import unittest
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
 from time import sleep as delay

tools/marvin/setup.py

@@ -49,6 +49,7 @@ setup(name="Marvin",
               "marvin.test"],
     license="LICENSE.txt",
     install_requires=[
+        "unittest2",
         "mysql-connector-python",
         "requests",
         "paramiko",