openstack
/
fuel-web
Code Issues Proposed changes

[PRD-2265] floating ip range and network size fix 

+ Fix UI test runner (https://review.openstack.org/#/c/52340/)

Change-Id: I3d06a7f2a2bb80244f3fb0c8b9d3bfaeaa77f7c0
This commit is contained in:
Aleksey Kasatkin 2013-10-17 11:03:55 +03:00
parent afe704e3ba
commit ef41415dc2
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
nailgun/nailgun/fixtures/openstack.json
View File

@ -44,9 +44,9 @@
"cidr": "172.16.0.0/24",
"netmask": "255.255.255.0",
"gateway": "172.16.0.1",
"ip_range": ["172.16.0.128", "172.16.0.255"],
"ip_range": ["172.16.0.128", "172.16.0.254"],
"vlan_start": 100,
"network_size": 128,
"network_size": 256,
"assign_vip": false
},
{
@ -63,7 +63,7 @@
"cidr": "192.168.0.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.0.1",
"ip_range": ["192.168.0.1", "192.168.0.255"],
"ip_range": ["192.168.0.1", "192.168.0.254"],
"vlan_start": 101,
"assign_vip": true
},
@ -72,7 +72,7 @@
"cidr": "192.168.1.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.1.1",
"ip_range": ["192.168.1.1", "192.168.1.255"],
"ip_range": ["192.168.1.1", "192.168.1.254"],
"vlan_start": 102,
"assign_vip": false
},
@ -81,7 +81,7 @@
"cidr": "10.0.0.0/16",
"netmask": "255.255.0.0",
"gateway": "10.0.0.1",
"ip_range": ["10.0.0.1", "10.0.255.255"],
"ip_range": ["10.0.0.2", "10.0.255.254"],
"vlan_start": 103,
"assign_vip": false
}
@ -567,9 +567,9 @@
"cidr": "172.16.0.0/24",
"netmask": "255.255.255.0",
"gateway": "172.16.0.1",
"ip_range": ["172.16.0.128", "172.16.0.255"],
"ip_range": ["172.16.0.128", "172.16.0.254"],
"vlan_start": 100,
"network_size": 128,
"network_size": 256,
"assign_vip": false
},
{
@ -586,7 +586,7 @@
"cidr": "192.168.0.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.0.1",
"ip_range": ["192.168.0.1", "192.168.0.255"],
"ip_range": ["192.168.0.1", "192.168.0.254"],
"vlan_start": 101,
"assign_vip": true
},
@ -595,7 +595,7 @@
"cidr": "192.168.1.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.1.1",
"ip_range": ["192.168.1.1", "192.168.1.255"],
"ip_range": ["192.168.1.1", "192.168.1.254"],
"vlan_start": 102,
"assign_vip": false
},
@ -604,7 +604,7 @@
"cidr": "10.0.0.0/16",
"netmask": "255.255.0.0",
"gateway": "10.0.0.1",
"ip_range": ["10.0.0.1", "10.0.255.255"],
"ip_range": ["10.0.0.2", "10.0.255.254"],
"vlan_start": 103,
"assign_vip": false
}
@ -963,9 +963,9 @@
"cidr": "172.16.0.0/24",
"netmask": "255.255.255.0",
"gateway": "172.16.0.1",
"ip_range": ["172.16.0.128", "172.16.0.255"],
"ip_range": ["172.16.0.128", "172.16.0.254"],
"vlan_start": 100,
"network_size": 128,
"network_size": 256,
"assign_vip": false
},
{
@ -982,7 +982,7 @@
"cidr": "192.168.0.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.0.1",
"ip_range": ["192.168.0.1", "192.168.0.255"],
"ip_range": ["192.168.0.1", "192.168.0.254"],
"vlan_start": 101,
"assign_vip": true
},
@ -991,7 +991,7 @@
"cidr": "192.168.1.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.1.1",
"ip_range": ["192.168.1.1", "192.168.1.255"],
"ip_range": ["192.168.1.1", "192.168.1.254"],
"vlan_start": 102,
"assign_vip": false
},
@ -1000,7 +1000,7 @@
"cidr": "10.0.0.0/16",
"netmask": "255.255.0.0",
"gateway": "10.0.0.1",
"ip_range": ["10.0.0.1", "10.0.255.255"],
"ip_range": ["10.0.0.2", "10.0.255.254"],
"vlan_start": 103,
"assign_vip": false
}

10
nailgun/nailgun/test/base.py
View File

@ -454,9 +454,9 @@ class Environment(object):
"cidr": "172.16.0.0/24",
"netmask": "255.255.255.0",
"gateway": "172.16.0.1",
"ip_range": ["172.16.0.128", "172.16.0.255"],
"ip_range": ["172.16.0.128", "172.16.0.254"],
"vlan_start": 100,
"network_size": 128
"network_size": 256
},
{
"name": "public",
@ -471,7 +471,7 @@ class Environment(object):
"cidr": "192.168.0.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.0.1",
"ip_range": ["192.168.0.2", "192.168.0.255"],
"ip_range": ["192.168.0.2", "192.168.0.254"],
"vlan_start": 101
},
{
@ -479,7 +479,7 @@ class Environment(object):
"cidr": "192.168.1.0/24",
"netmask": "255.255.255.0",
"gateway": "192.168.1.1",
"ip_range": ["192.168.1.1", "192.168.1.255"],
"ip_range": ["192.168.1.1", "192.168.1.254"],
"vlan_start": 102
},
{
@ -487,7 +487,7 @@ class Environment(object):
"cidr": "10.0.0.0/16",
"netmask": "255.255.0.0",
"gateway": "10.0.0.1",
"ip_range": ["10.0.0.1", "10.0.255.255"],
"ip_range": ["10.0.0.2", "10.0.255.254"],
"vlan_start": 103
}
],

2
nailgun/nailgun/test/integration/test_cluster_changes_handler.py
View File

@ -61,7 +61,7 @@ class TestHandlers(BaseIntegrationTest):
'fixed_network_range': '10.0.0.0/16',
'management_network_range': '192.168.0.0/24',
'floating_network_range': ['172.16.0.128-172.16.0.255'],
'floating_network_range': ['172.16.0.128-172.16.0.254'],
'storage_network_range': '192.168.1.0/24',
'mp': [{'weight': '1', 'point': '1'},

2
nailgun/nailgun/test/integration/test_cluster_collection_handlers.py
View File

@ -170,7 +170,7 @@ class TestHandlers(BaseIntegrationTest):
'release': release.id,
'name': u'floating',
'vlan_id': 100,
'cidr': '172.16.0.0/25',
'cidr': '172.16.0.0/24',
'gateway': '172.16.0.1'
},
{

2
run_tests.sh
View File

@ -188,8 +188,8 @@ function run_ui_tests {
done
./manage.py dropdb >> /dev/null
rm $test_server_log_file
)
return $result
)
}
if [ $just_ui_tests -eq 1 ]; then