DaanHoogland commented on code in PR #7112:
URL: https://github.com/apache/cloudstack/pull/7112#discussion_r1095763521
##########
test/integration/smoke/test_create_network.py:
##########
@@ -289,3 +289,86 @@ def test_02_create_network_with_same_name(self):
)
self.cleanup.append(self.network_offering)
+
+ @attr(tags=["adeancedsg"], required_hardware="false")
+ def test_03_create_network_with_empty_displayText(self):
+ """Create Shared network with empty displayText
+ and verify value of displayText after network
+ is being created.
+ """
+ # Update the global setting to true
+ Configurations.update(self.apiclient,
+ name="allow.duplicate.networkname",
+ value="true"
+ )
+
+ # Create network offering
+ self.network_offering = NetworkOffering.create(
+ self.apiclient,
+ self.testdata["network_offering_shared"]
+ )
Review Comment:
```suggestion
self.network_offering = NetworkOffering.create(
self.apiclient,
self.testdata["network_offering_shared"]
)
self.cleanup.append( self.network_offering)
```
##########
test/integration/smoke/test_create_network.py:
##########
@@ -289,3 +289,86 @@ def test_02_create_network_with_same_name(self):
)
self.cleanup.append(self.network_offering)
+
+ @attr(tags=["adeancedsg"], required_hardware="false")
+ def test_03_create_network_with_empty_displayText(self):
+ """Create Shared network with empty displayText
+ and verify value of displayText after network
+ is being created.
+ """
+ # Update the global setting to true
+ Configurations.update(self.apiclient,
+ name="allow.duplicate.networkname",
+ value="true"
+ )
+
+ # Create network offering
+ self.network_offering = NetworkOffering.create(
+ self.apiclient,
+ self.testdata["network_offering_shared"]
+ )
+
+ NetworkOffering.update(
+ self.network_offering,
+ self.apiclient,
+ id=self.network_offering.id,
+ state="enabled"
+ )
+
+ physical_network, vlan = get_free_vlan(self.apiclient, self.zone.id)
+ self.testdata["shared_network_sg"]["physicalnetworkid"] =
physical_network.id
+
+ random_subnet_number = random.randrange(100, 199)
+ self.testdata["shared_network_sg"]["specifyVlan"] = 'True'
+ self.testdata["shared_network_sg"]["specifyIpRanges"] = 'True'
+ self.testdata["shared_network_sg"]["name"] =
"Shared-Network-SG-Test-vlan-1"
+ self.testdata["shared_network_sg"]["displayText"] = ''
+ self.testdata["shared_network_sg"]["vlan"] = "vlan://" +
str(random_subnet_number)
+ self.testdata["shared_network_sg"]["startip"] = "192.168." +
str(random_subnet_number) + ".1"
+ self.testdata["shared_network_sg"]["endip"] = "192.168." +
str(random_subnet_number) + ".10"
+ self.testdata["shared_network_sg"]["gateway"] = "192.168." +
str(random_subnet_number) + ".254"
+ self.testdata["shared_network_sg"]["netmask"] = "255.255.255.0"
+ self.testdata["shared_network_sg"]["acltype"] = "account"
+
+ # Create the first network with empty displayText
+ network1 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.cleanup.append(network1)
+
+ self.assertEqual(
+ network.displayText,
+ self.testdata["shared_network_sg"]["name"],
+ msg="displayText does not match name"
+ )
+
+ self.testdata["shared_network_sg"]["displayText"] = 'test'
+
+ #Create the second network with non-empty displayText
+ network2 = Network.create(
+ self.apiclient,
+ self.testdata["shared_network_sg"],
+ networkofferingid=self.network_offering.id,
+ zoneid=self.zone.id,
+ accountid=self.account.name,
+ domainid=self.account.domainid
+ )
+
+ self.assertNotEqual(
+ network.displayText,
+ self.testdata["shared_network_sg"]["name"],
+ msg="displayText does not match name"
+ )
+
+ self.cleanup.append(network2)
Review Comment:
```suggestion
self.cleanup.append(network2)
self.assertNotEqual(
network.displayText,
self.testdata["shared_network_sg"]["name"],
msg="displayText does not match name"
)
```
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
