Skip to content

Commit e0a842c

Browse files
authored
test: Changing test_pvlan vlan id to prevent conflict with env config (#4340)
1 parent 86fcb14 commit e0a842c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

test/integration/smoke/test_pvlan.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,8 +35,8 @@ class TestPVLAN(cloudstackTestCase):
3535

3636
zoneId = 1
3737
networkOfferingId = 7
38-
vlan = 1234
39-
isolatedpvlan = 567
38+
vlan = 2468
39+
isolatedpvlan = 864
4040

4141
def setUp(self):
4242
self.apiClient = self.testClient.getApiClient()
@@ -51,18 +51,19 @@ def test_create_pvlan_network(self):
5151
createNetworkCmd.gateway = "10.10.10.1"
5252
createNetworkCmd.startip = "10.10.10.10"
5353
createNetworkCmd.gateway = "10.10.10.20"
54-
createNetworkCmd.vlan = "1234"
55-
createNetworkCmd.isolatedpvlan = "567"
54+
createNetworkCmd.vlan = self.vlan
55+
createNetworkCmd.isolatedpvlan = self.isolatedpvlan
5656
createNetworkCmd.zoneid = self.zoneId
5757
createNetworkCmd.networkofferingid = self.networkOfferingId
5858
createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd)
5959
self.networkId = createNetworkResponse.id
6060
self.broadcasttype = createNetworkResponse.broadcastdomaintype
6161
self.broadcasturi = createNetworkResponse.broadcasturi
6262

63+
braodcasturi = "pvlan://{0}-i{1}".format(self.vlan, self.isolatedpvlan)
6364
self.assertIsNotNone(createNetworkResponse.id, "Network failed to create")
6465
self.assertTrue(createNetworkResponse.broadcastdomaintype, "Pvlan")
65-
self.assertTrue(createNetworkResponse.broadcasturi, "pvlan://1234-i567")
66+
self.assertTrue(createNetworkResponse.broadcasturi, braodcasturi)
6667

6768
self.debug("Clean up test pvlan network")
6869
deleteNetworkCmd = deleteNetwork.deleteNetworkCmd()

0 commit comments

Comments
 (0)