This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 25ed664628 Fix main branch by removing unnecessary commits, syncing
4.17 to main
25ed664628 is described below
commit 25ed664628b2a4231844b2e0ee1d93848d19173a
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Jun 17 20:29:25 2022 +0530
Fix main branch by removing unnecessary commits, syncing 4.17 to main
This reverts commit 5b9b117301d5fe0d6e7dac817d9f6d968a69f0de.
This reverts commit 98bc4415da2eeb875dbac66d538257c808060f50.
---
test/integration/broken/test_vpc_vm_life_cycle.py | 2 +-
test/integration/component/test_host_ha.py | 49 +++++++---------------
.../component/test_rootvolume_resize.py | 6 +--
ui/src/store/modules/user.js | 3 +-
4 files changed, 20 insertions(+), 40 deletions(-)
diff --git a/test/integration/broken/test_vpc_vm_life_cycle.py
b/test/integration/broken/test_vpc_vm_life_cycle.py
index c1868d009f..9290835c2e 100644
--- a/test/integration/broken/test_vpc_vm_life_cycle.py
+++ b/test/integration/broken/test_vpc_vm_life_cycle.py
@@ -19,7 +19,7 @@ from nose.plugins.attrib import attr
from component.test_vpc_vm_life_cycle import Services
-class TestVMLifeCycleSharedNwVPC(cloudstackTesTODOtCase):
+class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
@classmethod
def setUpClass(cls):
diff --git a/test/integration/component/test_host_ha.py
b/test/integration/component/test_host_ha.py
index d32e708b08..e6dd20bfe6 100644
--- a/test/integration/component/test_host_ha.py
+++ b/test/integration/component/test_host_ha.py
@@ -17,22 +17,19 @@
""" BVT tests for Hosts Maintenance
"""
-# Import Local Modules
-from marvin.codes import FAILED
from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
from marvin.lib.utils import *
from marvin.lib.base import *
from marvin.lib.common import *
from nose.plugins.attrib import attr
-from time import sleep
-
_multiprocess_shared_ = False
class TestHostHA(cloudstackTestCase):
+ hostCountMsg = "Host HA can be tested with at least two hosts, only %s
found"
+
def setUp(self):
self.logger = logging.getLogger('TestHM')
self.stream_handler = logging.StreamHandler()
@@ -86,17 +83,8 @@ class TestHostHA(cloudstackTestCase):
"timeout": 10,
}
-
def tearDown(self):
- try:
- # Clean up, terminate the created templates
- cleanup_resources(self.apiclient, self.cleanup)
-
- except Exception as e:
- raise Exception("Warning: Exception during cleanup : %s" % e)
-
- return
-
+ super(TestHostHA, self).tearDown()
def createVMs(self, hostId, number, local):
@@ -319,11 +307,9 @@ class TestHostHA(cloudstackTestCase):
for host in listHost:
self.logger.debug('Hypervisor = {}'.format(host.id))
-
- if len(listHost) != 2:
- self.logger.debug("Host HA can be tested with two host only %s,
found" % len(listHost))
- raise unittest.SkipTest("Host HA can be tested with two host only
%s, found" % len(listHost))
-
+ if len(listHost) < 2:
+ self.logger.debug(self.hostCountMsg % len(listHost))
+ raise unittest.SkipTest(self.hostCountMsg % len(listHost))
no_of_vms = self.noOfVMsOnHost(listHost[0].id)
@@ -331,7 +317,6 @@ class TestHostHA(cloudstackTestCase):
self.logger.debug("Number of VMS on hosts = %s" % no_of_vms)
-
if no_of_vms < 5:
self.logger.debug("test_01: Create VMs as there are not enough vms
to check host ha")
no_vm_req = 5 - no_of_vms
@@ -396,10 +381,9 @@ class TestHostHA(cloudstackTestCase):
for host in listHost:
self.logger.debug('Hypervisor = {}'.format(host.id))
-
- if len(listHost) != 2:
- self.logger.debug("Host HA can be tested with two host only %s,
found" % len(listHost))
- raise unittest.SkipTest("Host HA can be tested with two host only
%s, found" % len(listHost))
+ if len(listHost) < 2:
+ self.logger.debug(self.hostCountMsg % len(listHost))
+ raise unittest.SkipTest(self.hostCountMsg % len(listHost))
no_of_vms = self.noOfVMsOnHost(listHost[0].id)
@@ -473,10 +457,9 @@ class TestHostHA(cloudstackTestCase):
for host in listHost:
self.logger.debug('Hypervisor = {}'.format(host.id))
-
- if len(listHost) != 2:
- self.logger.debug("Host HA can be tested with two host only %s,
found" % len(listHost))
- raise unittest.SkipTest("Host HA can be tested with two host only
%s, found" % len(listHost))
+ if len(listHost) < 2:
+ self.logger.debug(self.hostCountMsg % len(listHost))
+ raise unittest.SkipTest(self.hostCountMsg % len(listHost))
no_of_vms = self.noOfVMsOnHost(listHost[0].id)
@@ -548,10 +531,9 @@ class TestHostHA(cloudstackTestCase):
for host in listHost:
self.logger.debug('Hypervisor = {}'.format(host.id))
-
- if len(listHost) != 2:
- self.logger.debug("Host HA can be tested with two host only %s,
found" % len(listHost))
- raise unittest.SkipTest("Host HA can be tested with two host only
%s, found" % len(listHost))
+ if len(listHost) < 2:
+ self.logger.debug(self.hostCountMsg % len(listHost))
+ raise unittest.SkipTest(self.hostCountMsg % len(listHost))
no_of_vms = self.noOfVMsOnHost(listHost[0].id)
@@ -559,7 +541,6 @@ class TestHostHA(cloudstackTestCase):
self.logger.debug("Number of VMS on hosts = %s" % no_of_vms)
-
if no_of_vms < 5:
self.logger.debug("test_01: Create VMs as there are not enough vms
to check host ha")
no_vm_req = 5 - no_of_vms
diff --git a/test/integration/component/test_rootvolume_resize.py
b/test/integration/component/test_rootvolume_resize.py
index 1b1a6fe6db..7e58d1e3f4 100644
--- a/test/integration/component/test_rootvolume_resize.py
+++ b/test/integration/component/test_rootvolume_resize.py
@@ -773,7 +773,7 @@ class TestResizeVolume(cloudstackTestCase):
return
@attr(tags=["advanced"], required_hardware="true")
- def test_5_vmdeployment_with_size(self):
+ def test_05_vmdeployment_with_size(self):
"""Test vm deployment with new rootdisk size parameter
# Validate the following
@@ -855,7 +855,7 @@ class TestResizeVolume(cloudstackTestCase):
@attr(tags=["advanced"], required_hardware="true")
- def test_6_resized_rootvolume_with_lessvalue(self):
+ def test_06_resized_rootvolume_with_lessvalue(self):
"""Test resize root volume with less than original volume size
# Validate the following
@@ -939,7 +939,7 @@ class TestResizeVolume(cloudstackTestCase):
# @attr(tags=["advanced"], required_hrdware="true")
@attr(tags=["TODO"], required_hrdware="true")
- def test_7_usage_events_after_rootvolume_resized_(self):
+ def test_07_usage_events_after_rootvolume_resized_(self):
"""Test check usage events after root volume resize
# Validate the following
diff --git a/ui/src/store/modules/user.js b/ui/src/store/modules/user.js
index cf4e420df0..3a5233aa13 100644
--- a/ui/src/store/modules/user.js
+++ b/ui/src/store/modules/user.js
@@ -58,8 +58,7 @@ const user = {
darkMode: false,
defaultListViewPageSize: 20,
countNotify: 0,
- logoutFlag: false,
- customColumns: {}
+ logoutFlag: false
},
mutations: {
