You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/10/30 11:07:10 UTC
[1/5] git commit: updated refs/heads/4.5 to aa1e260
Repository: cloudstack
Updated Branches:
refs/heads/4.5 a1e7feead -> aa1e26081
CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which we are checking the usage
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9fed951
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9fed951
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9fed951
Branch: refs/heads/4.5
Commit: b9fed951ef6498c828f07ab120a242fcf15e14f6
Parents: a1e7fee
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Oct 8 11:25:15 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Oct 30 15:28:39 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_usage.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9fed951/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 81cce48..58cfbed 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -669,6 +669,9 @@ class TestTemplateUsage(cloudstackTestCase):
domainid=cls.domain.id
)
cls._cleanup.append(cls.account)
+ cls.userapiclient = cls.testClient.getUserApiClient(
+ UserName=cls.account.name,
+ DomainName=cls.account.domain)
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create(
@@ -742,7 +745,7 @@ class TestTemplateUsage(cloudstackTestCase):
#Create template from Virtual machine and Volume ID
self.template = Template.create(
- self.apiclient,
+ self.userapiclient,
self.services["templates"],
self.volume.id,
TestTemplateUsage.account.name,
@@ -750,7 +753,7 @@ class TestTemplateUsage(cloudstackTestCase):
)
self.debug("Created template with ID: %s" % self.template.id)
# Delete template
- self.template.delete(self.apiclient)
+ self.template.delete(self.userapiclient)
self.debug("Deleted template with ID: %s" % self.template.id)
# Fetch account ID from account_uuid
[4/5] git commit: updated refs/heads/4.5 to aa1e260
Posted by ta...@apache.org.
CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f297efe
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f297efe
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f297efe
Branch: refs/heads/4.5
Commit: 4f297efef5627f04348a6b9ac550bef2364cb661
Parents: e2ba1b6
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Oct 9 15:14:30 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Oct 30 15:33:37 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_project_usage.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f297efe/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 3262e40..2627504 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -712,6 +712,9 @@ class TestTemplateUsage(cloudstackTestCase):
domainid=cls.domain.id
)
cls._cleanup.append(cls.account)
+ cls.userapiclient = cls.testClient.getUserApiClient(
+ UserName=cls.account.name,
+ DomainName=cls.account.domain)
cls.services["account"] = cls.account.name
cls.project = Project.create(
@@ -789,7 +792,7 @@ class TestTemplateUsage(cloudstackTestCase):
#Create template from Virtual machine and Volume ID
self.template = Template.create(
- self.apiclient,
+ self.userapiclient,
self.services["templates"],
self.volume.id,
projectid=self.project.id
[3/5] git commit: updated refs/heads/4.5 to aa1e260
Posted by ta...@apache.org.
CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2ba1b61
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2ba1b61
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2ba1b61
Branch: refs/heads/4.5
Commit: e2ba1b614c7792856314cfa363f2a4e9cd667065
Parents: dc4b04f
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Thu Oct 9 14:56:34 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Oct 30 15:32:24 2014 +0530
----------------------------------------------------------------------
.../component/test_project_limits.py | 51 ++++++++++++++------
1 file changed, 37 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ba1b61/test/integration/component/test_project_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 5f33ad8..5d37f0b 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -5,9 +5,9 @@
# 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
@@ -17,16 +17,35 @@
""" P1 tests for Resource limits
"""
#Import Local Modules
-import marvin
from nose.plugins.attrib import attr
-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.cloudstackTestCase import cloudstackTestCase
+#from marvin.cloudstackAPI import *
+from marvin.lib.utils import (cleanup_resources,
+ validateList)
+from marvin.lib.base import (Account,
+ Domain,
+ Project,
+ Template,
+ Snapshot,
+ Volume,
+ NetworkOffering,
+ ServiceOffering,
+ VirtualMachine,
+ DiskOffering,
+ Configurations,
+ Network,
+ PublicIPAddress)
+from marvin.lib.common import (get_domain,
+ get_zone,
+ get_template,
+ list_snapshots,
+ list_volumes,
+ list_configurations,
+ list_resource_limits,
+ update_resource_limit
+ )
from marvin.codes import PASS
-import datetime
-
+import time
class Services:
"""Test Resource Limits Services
@@ -525,6 +544,11 @@ class TestResourceLimitsProject(cloudstackTestCase):
cls.services["account"],
domainid=cls.domain.id
)
+
+ cls.userapiclient = cls.testClient.getUserApiClient(
+ UserName=cls.account.name,
+ DomainName=cls.account.domain)
+
# Create project as a domain admin
cls.project = Project.create(
cls.api_client,
@@ -713,7 +737,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
# Exception should be raised for second Public IP
with self.assertRaises(Exception):
- public_ip_2 = PublicIPAddress.create(
+ PublicIPAddress.create(
self.apiclient,
zoneid=virtual_machine_1.zoneid,
services=self.services["server"],
@@ -772,7 +796,6 @@ class TestResourceLimitsProject(cloudstackTestCase):
True,
"Check for list volume response return valid data"
)
- volume = volumes[0]
self.debug("Creating snapshot from volume: %s" % volumes[0].id)
# Create a snapshot from the ROOTDISK
@@ -915,7 +938,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
self.debug("Creating template from volume: %s" % volume.id)
# Create a template from the ROOTDISK
template_1 = Template.create(
- self.apiclient,
+ self.userapiclient,
self.services["template"],
volumeid=volume.id,
projectid=self.project.id
@@ -932,7 +955,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
# Exception should be raised for second template
with self.assertRaises(Exception):
Template.create(
- self.apiclient,
+ self.userapiclient,
self.services["template"],
volumeid=volume.id,
projectid=self.project.id
[2/5] git commit: updated refs/heads/4.5 to aa1e260
Posted by ta...@apache.org.
CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc4b04fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc4b04fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc4b04fb
Branch: refs/heads/4.5
Commit: dc4b04fbe87048849d51e9e4dbcce566de7f9cf0
Parents: b9fed95
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Wed Oct 8 11:57:45 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Oct 30 15:31:19 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_ss_max_limits.py | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc4b04fb/test/integration/component/test_ss_max_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_ss_max_limits.py b/test/integration/component/test_ss_max_limits.py
index ba886e8..49a1e4f 100644
--- a/test/integration/component/test_ss_max_limits.py
+++ b/test/integration/component/test_ss_max_limits.py
@@ -101,7 +101,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.services["template_2"]["hypervisor"] = builtin_info[1]
self.services["template_2"]["format"] = builtin_info[2]
- template = Template.register(self.apiclient,
+ template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name if not inProject else None,
@@ -110,7 +110,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
template.download(self.apiclient)
- templates = Template.list(self.apiclient,
+ templates = Template.list(self.userapiclient,
templatefilter=\
self.services["template_2"]["templatefilter"],
id=template.id)
@@ -131,6 +131,10 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.child_do_admin = Account.create(self.apiclient, self.services["account"], admin=True,
domainid=self.child_domain.id)
+ self.userapiclient = self.testClient.getUserApiClient(
+ UserName=self.child_do_admin.name,
+ DomainName=self.child_do_admin.domain)
+
# Create project as a domain admin
self.project = Project.create(self.apiclient, self.services["project"],
account=self.child_do_admin.name,
@@ -195,11 +199,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
- template = Template.register(self.apiclient,
+ template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name,
domainid=self.child_do_admin.domainid)
+ template.delete(self.userapiclient)
return
@attr(tags=["advanced"], required_hardware="false")
@@ -231,11 +236,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
- template = Template.register(self.apiclient,
+ template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
account=self.child_do_admin.name,
domainid=self.child_do_admin.domainid)
+ template.delete(self.userapiclient)
return
@attr(tags=["advanced"], required_hardware="false")
@@ -256,7 +262,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
try:
- projects = Project.list(self.apiclient, id=self.project.id, listall=True)
+ projects = Project.list(self.userapiclient, id=self.project.id, listall=True)
except Exception as e:
self.fail("failed to get projects list: %s" % e)
@@ -272,8 +278,9 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
self.assertEqual(response[0], PASS, response[1])
with self.assertRaises(Exception):
- template = Template.register(self.apiclient,
+ template = Template.register(self.userapiclient,
self.services["template_2"],
zoneid=self.zone.id,
projectid=self.project.id)
+ template.delete(self.userapiclient)
return
[5/5] git commit: updated refs/heads/4.5 to aa1e260
Posted by ta...@apache.org.
CLOUDSTACK-7728: Test script to identify product issue
Signed-off-by: SrikanteswaraRao Talluri <ta...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa1e2608
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa1e2608
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa1e2608
Branch: refs/heads/4.5
Commit: aa1e26081208b5d6c758a6efbbf3b62ab2d6720d
Parents: 4f297ef
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri Oct 17 14:43:21 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Thu Oct 30 15:35:32 2014 +0530
----------------------------------------------------------------------
test/integration/component/test_egress_fw_rules.py | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa1e2608/test/integration/component/test_egress_fw_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py
index 12bade4..0122e4f 100755
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -397,11 +397,18 @@ class TestEgressFWRules(cloudstackTestCase):
# 2. login to VM.
# 3. ping public network.
# 4. public network should be reachable from the VM.
+ # 5. Reboot the router
+ # 6. Ping public network from VM, it should be reachable
self.create_vm()
self.exec_script_on_user_vm('ping -c 1 www.google.com',
"| grep -oP \'\d+(?=% packet loss)\'",
"['0']",
negative_test=False)
+ self.reboot_Router()
+ self.exec_script_on_user_vm('ping -c 1 www.google.com',
+ "| grep -oP \'\d+(?=% packet loss)\'",
+ "['0']",
+ negative_test=False)
@attr(tags=["advanced"], required_hardware="true")
def test_01_1_egress_fr1(self):