DaanHoogland commented on a change in pull request #5106:
URL: https://github.com/apache/cloudstack/pull/5106#discussion_r654458125
##########
File path: test/integration/smoke/test_direct_download.py
##########
@@ -184,20 +184,28 @@ def setUpClass(cls):
cls.services["service_offerings"]["tiny"]
)
cls._cleanup.append(cls.service_offering)
- cls.network_offering = NetworkOffering.create(
- cls.apiclient,
- cls.services["l2-network_offering"],
- )
- cls.network_offering.update(cls.apiclient, state='Enabled')
- cls.services["network"]["networkoffering"] =
cls.network_offering.id
- cls.l2_network = Network.create(
- cls.apiclient,
- cls.services["l2-network"],
- zoneid=cls.zone.id,
- networkofferingid=cls.network_offering.id
- )
- cls._cleanup.append(cls.l2_network)
- cls._cleanup.append(cls.network_offering)
+
+ if cls.zone.networktype == 'Basic' :
+ networks = Network.list(cls.apiclient)
+ if len(networks) == 0 :
+ self.skipTest("Skipping test since no network found in
basic zone")
+ else :
+ cls.network = networks[0]
+ else :
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["l2-network_offering"],
+ )
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+ cls.services["network"]["networkoffering"] =
cls.network_offering.id
+ cls.network = Network.create(
+ cls.apiclient,
+ cls.services["l2-network"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.network_offering.id
+ )
+ cls._cleanup.append(cls.network)
+ cls._cleanup.append(cls.network_offering)
Review comment:
these should be reversed and nearer to the respective creations
```suggestion
cls.network_offering = NetworkOffering.create(
cls.apiclient,
cls.services["l2-network_offering"],
)
cls._cleanup.append(cls.network_offering)
cls.network_offering.update(cls.apiclient, state='Enabled')
cls.services["network"]["networkoffering"] =
cls.network_offering.id
cls.network = Network.create(
cls.apiclient,
cls.services["l2-network"],
zoneid=cls.zone.id,
networkofferingid=cls.network_offering.id
)
cls._cleanup.append(cls.network)
```
and also the tearDownClass should read:
```
@classmethod
def tearDownClass(cls):
super(TestDirectDownloadTemplates, cls).tearDownClass()
```
(could be a separate PR but I tend to touch no test files without these kind
of changes)
##########
File path: test/integration/smoke/test_direct_download.py
##########
@@ -269,6 +277,21 @@ def createServiceOffering(self, name, type, tags):
tags=tags
)
+ def deployVM(self, offering) :
+ if self.zone.networktype == 'Basic' :
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ serviceofferingid=offering.id
+ )
Review comment:
this should add
```suggestion
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
serviceofferingid=offering.id
)
self.cleanup.append(vm)
```
and not outside the method.
Same for createServiceOffering
##########
File path: test/integration/smoke/test_direct_download.py
##########
@@ -269,6 +277,21 @@ def createServiceOffering(self, name, type, tags):
tags=tags
)
+ def deployVM(self, offering) :
+ if self.zone.networktype == 'Basic' :
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ serviceofferingid=offering.id
+ )
+ else :
+ vm = VirtualMachine.create(
+ self.apiclient,
+ self.services["virtual_machine"],
+ serviceofferingid=offering.id,
+ networkids=self.network.id
+ )
Review comment:
```suggestion
)
self.cleanup.append(vm)
```
##########
File path: test/integration/smoke/test_direct_download.py
##########
@@ -184,20 +184,28 @@ def setUpClass(cls):
cls.services["service_offerings"]["tiny"]
)
cls._cleanup.append(cls.service_offering)
- cls.network_offering = NetworkOffering.create(
- cls.apiclient,
- cls.services["l2-network_offering"],
- )
- cls.network_offering.update(cls.apiclient, state='Enabled')
- cls.services["network"]["networkoffering"] =
cls.network_offering.id
- cls.l2_network = Network.create(
- cls.apiclient,
- cls.services["l2-network"],
- zoneid=cls.zone.id,
- networkofferingid=cls.network_offering.id
- )
- cls._cleanup.append(cls.l2_network)
- cls._cleanup.append(cls.network_offering)
+
+ if cls.zone.networktype == 'Basic' :
+ networks = Network.list(cls.apiclient)
+ if len(networks) == 0 :
+ self.skipTest("Skipping test since no network found in
basic zone")
+ else :
+ cls.network = networks[0]
+ else :
+ cls.network_offering = NetworkOffering.create(
+ cls.apiclient,
+ cls.services["l2-network_offering"],
+ )
+ cls.network_offering.update(cls.apiclient, state='Enabled')
+ cls.services["network"]["networkoffering"] =
cls.network_offering.id
+ cls.network = Network.create(
+ cls.apiclient,
+ cls.services["l2-network"],
+ zoneid=cls.zone.id,
+ networkofferingid=cls.network_offering.id
+ )
+ cls._cleanup.append(cls.network)
+ cls._cleanup.append(cls.network_offering)
Review comment:
and btw
```
def tearDown(self):
super(TestDirectDownloadTemplates, swlf).tearDown()
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
