[cloudstack] 23/24: Fix travis due to L2 PR merge, and changes to test_network.py

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch debian9-systemvmtemplate
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit a032e22c378ff69c88ac63e2608afe9421c6abf3
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Wed Dec 20 20:16:25 2017 +0530

    Fix travis due to L2 PR merge, and changes to test_network.py
    
    Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
 test/integration/smoke/test_network.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 742243d..1a0d1a7 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -1300,6 +1300,7 @@ class TestL2Networks(cloudstackTestCase):
         # Get Zone, Domain and templates
         cls.domain = get_domain(cls.apiclient)
         cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
+        cls.hypervisor = testClient.getHypervisorInfo()
         cls.services['mode'] = cls.zone.networktype
         # Create Accounts & networks
         cls.account = Account.create(
@@ -1308,10 +1309,10 @@ class TestL2Networks(cloudstackTestCase):
             admin=True,
             domainid=cls.domain.id
         )
-        cls.template = get_template(
+        cls.template = get_test_template(
             cls.apiclient,
             cls.zone.id,
-            cls.services["ostype"]
+            cls.hypervisor
         )
         cls.service_offering = ServiceOffering.create(
             cls.apiclient,

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.