You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/12/04 08:27:37 UTC
[cloudstack] branch debian9-systemvmtemplate updated (9d2c7d3 ->
6669219)
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a change to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 9d2c7d3 More fixes
new 1544150 deployment of dc/cluster/hosts already validates this, this test does not run and therefore could be removed
new 6669219 avoid restarting networking again
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 1 -
.../patches/debian/opt/cloud/bin/setup/postinit.sh | 1 -
test/integration/smoke/test_hosts.py | 170 ---------------------
3 files changed, 172 deletions(-)
delete mode 100644 test/integration/smoke/test_hosts.py
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].
[cloudstack] 02/02: avoid restarting networking again
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 666921905fa492646ed3471a93cbb9d340de86a3
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Dec 4 13:57:02 2017 +0530
avoid restarting networking again
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh b/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
index 58a3ecc..8149d2d 100755
--- a/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
+++ b/systemvm/patches/debian/opt/cloud/bin/setup/postinit.sh
@@ -26,6 +26,5 @@ then
then
/opt/cloud/bin/update_config.py cmd_line.json
logger -t cloud "Updated config: cmd_line.json"
- systemctl restart networking
fi
fi
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.
[cloudstack] 01/02: deployment of dc/cluster/hosts already
validates this, this test does not run and therefore could be removed
Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 1544150886fc9859ddb86d91bb94beec3782c6d9
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Dec 4 13:56:29 2017 +0530
deployment of dc/cluster/hosts already validates this, this test does not
run and therefore could be removed
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
.travis.yml | 1 -
test/integration/smoke/test_hosts.py | 170 -----------------------------------
2 files changed, 171 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ee52d9e..b46865a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,6 @@ env:
smoke/test_hostha_simulator
smoke/test_host_annotations
smoke/test_host_maintenance
- smoke/test_hosts
smoke/test_internal_lb
smoke/test_iso
smoke/test_list_ids_parameter
diff --git a/test/integration/smoke/test_hosts.py b/test/integration/smoke/test_hosts.py
deleted file mode 100644
index 952f160..0000000
--- a/test/integration/smoke/test_hosts.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you 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.
-""" BVT tests for Hosts and Clusters
-"""
-#Import Local Modules
-import marvin
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import (random_gen)
-from nose.plugins.attrib import attr
-
-#Import System modules
-import time
-
-_multiprocess_shared_ = True
-
-class TestHosts(cloudstackTestCase):
-
- def setUp(self):
- self.apiclient = self.testClient.getApiClient()
- self.hypervisor = self.testClient.getHypervisorInfo()
- self.dbclient = self.testClient.getDbConnection()
- self.services = self.testClient.getParsedTestDataConfig()
- self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
- self.pod = get_pod(self.apiclient, self.zone.id)
- self.cleanup = []
-
- return
-
- 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
-
- #@attr(tags=["selfservice"])
- def test_01_clusters(self):
- """Test Add clusters & hosts - simulator
-
-
- # Validate the following:
- # 1. Verify hypervisortype returned by API is Simulator/Xen/KVM/VWare
- # 2. Verify that the cluster is in 'Enabled' allocation state
- # 3. Verify that the host is added successfully and in Up state
- # with listHosts API response
-
- #Create clusters with Hypervisor type Simulator/XEN/KVM/VWare
- """
- for k, v in self.services["clusters"].items():
- v["clustername"] = v["clustername"] + "-" + random_gen()
- cluster = Cluster.create(
- self.apiclient,
- v,
- zoneid=self.zone.id,
- podid=self.pod.id,
- hypervisor=v["hypervisor"].lower()
- )
- self.debug(
- "Created Cluster for hypervisor type %s & ID: %s" %(
- v["hypervisor"],
- cluster.id
- ))
- self.assertEqual(
- cluster.hypervisortype.lower(),
- v["hypervisor"].lower(),
- "Check hypervisor type is " + v["hypervisor"] + " or not"
- )
- self.assertEqual(
- cluster.allocationstate,
- 'Enabled',
- "Check whether allocation state of cluster is enabled"
- )
-
- #If host is externally managed host is already added with cluster
- response = list_hosts(
- self.apiclient,
- clusterid=cluster.id
- )
-
- if not response:
- hypervisor_type = str(cluster.hypervisortype.lower())
- host = Host.create(
- self.apiclient,
- cluster,
- self.services["hosts"][hypervisor_type],
- zoneid=self.zone.id,
- podid=self.pod.id,
- hypervisor=v["hypervisor"].lower()
- )
- if host == FAILED:
- self.fail("Host Creation Failed")
- self.debug(
- "Created host (ID: %s) in cluster ID %s" %(
- host.id,
- cluster.id
- ))
- #Cleanup Host & Cluster
- self.cleanup.append(host)
- self.cleanup.append(cluster)
-
- list_hosts_response = list_hosts(
- self.apiclient,
- clusterid=cluster.id
- )
- self.assertEqual(
- isinstance(list_hosts_response, list),
- True,
- "Check list response returns a valid list"
- )
- self.assertNotEqual(
- len(list_hosts_response),
- 0,
- "Check list Hosts response"
- )
-
- host_response = list_hosts_response[0]
- #Check if host is Up and running
- self.assertEqual(
- host_response.state,
- 'Up',
- "Check if state of host is Up or not"
- )
- #Verify List Cluster Response has newly added cluster
- list_cluster_response = list_clusters(
- self.apiclient,
- id=cluster.id
- )
- self.assertEqual(
- isinstance(list_cluster_response, list),
- True,
- "Check list response returns a valid list"
- )
- self.assertNotEqual(
- len(list_cluster_response),
- 0,
- "Check list Hosts response"
- )
-
- cluster_response = list_cluster_response[0]
- self.assertEqual(
- cluster_response.id,
- cluster.id,
- "Check cluster ID with list clusters response"
- )
- self.assertEqual(
- cluster_response.hypervisortype.lower(),
- cluster.hypervisortype.lower(),
- "Check hypervisor type with is " + v["hypervisor"] + " or not"
- )
- return
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.