Remove nova-network
Co-Authored-By: jinke <jin.ke@99cloud.net> Co-Authored-By: caowei <cao.wei@99cloud.net> Change-Id: I769089ef8f01935804b7b342212234539b4c366d
This commit is contained in:
parent
a225824efc
commit
cdfbaac4ed
|
@ -63,8 +63,6 @@ The following variables are currently used by defaults templates:
|
||||||
+-----------------------------+--------+-------------------------+
|
+-----------------------------+--------+-------------------------+
|
||||||
| Variable | Type | Value |
|
| Variable | Type | Value |
|
||||||
+=============================+========+=========================+
|
+=============================+========+=========================+
|
||||||
| network_type | string | neutron or nova-network |
|
|
||||||
+-----------------------------+--------+-------------------------+
|
|
||||||
| network_private_name | string | private network name |
|
| network_private_name | string | private network name |
|
||||||
| | | for OS_PROJECT_NAME |
|
| | | for OS_PROJECT_NAME |
|
||||||
+-----------------------------+--------+-------------------------+
|
+-----------------------------+--------+-------------------------+
|
||||||
|
@ -381,9 +379,6 @@ This section is dictionary-type.
|
||||||
| public_network | string | | public | name or id of |
|
| public_network | string | | public | name or id of |
|
||||||
| | | | | private network|
|
| | | | | private network|
|
||||||
+-----------------------------+---------+----------+---------+----------------+
|
+-----------------------------+---------+----------+---------+----------------+
|
||||||
| type | string | | neutron | "neutron" or |
|
|
||||||
| | | | | "nova-network" |
|
|
||||||
+-----------------------------+---------+----------+---------+----------------+
|
|
||||||
| auto_assignment_floating_ip | boolean | | False | |
|
| auto_assignment_floating_ip | boolean | | False | |
|
||||||
+-----------------------------+---------+----------+---------+----------------+
|
+-----------------------------+---------+----------+---------+----------------+
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
network:
|
network:
|
||||||
type: ${network_type}
|
|
||||||
private_network: ${network_private_name}
|
private_network: ${network_private_name}
|
||||||
public_network: ${network_public_name}
|
public_network: ${network_public_name}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Removed nova-network configuration. Nova network has been fully
|
||||||
|
removed from the OpenStack codebase, in all releases supported
|
||||||
|
by sahara-tests.
|
|
@ -573,11 +573,8 @@ class BaseTestCase(base.BaseTestCase):
|
||||||
proxy_exist = False
|
proxy_exist = False
|
||||||
|
|
||||||
if self.network['public_network']:
|
if self.network['public_network']:
|
||||||
if self.network['type'] == 'neutron':
|
floating_ip_pool = self.neutron.get_network_id(
|
||||||
floating_ip_pool = self.neutron.get_network_id(
|
self.network['public_network'])
|
||||||
self.network['public_network'])
|
|
||||||
elif not self.network['auto_assignment_floating_ip']:
|
|
||||||
floating_ip_pool = self.network['public_network']
|
|
||||||
|
|
||||||
node_groups = []
|
node_groups = []
|
||||||
for ng in self.testcase['node_group_templates']:
|
for ng in self.testcase['node_group_templates']:
|
||||||
|
@ -647,9 +644,8 @@ class BaseTestCase(base.BaseTestCase):
|
||||||
|
|
||||||
kwargs.update(self.plugin_opts)
|
kwargs.update(self.plugin_opts)
|
||||||
kwargs['name'] = utils.rand_name(kwargs.get('name', 'ct'))
|
kwargs['name'] = utils.rand_name(kwargs.get('name', 'ct'))
|
||||||
if self.network['type'] == 'neutron':
|
kwargs['net_id'] = self.neutron.get_network_id(
|
||||||
kwargs['net_id'] = self.neutron.get_network_id(
|
self.network['private_network'])
|
||||||
self.network['private_network'])
|
|
||||||
|
|
||||||
return self.__create_cluster_template(**kwargs)
|
return self.__create_cluster_template(**kwargs)
|
||||||
|
|
||||||
|
|
|
@ -11,10 +11,9 @@ Details
|
||||||
|
|
||||||
Key values (mako variables):
|
Key values (mako variables):
|
||||||
|
|
||||||
* ${network_type} - network type (neutron or nova-network);
|
|
||||||
* ${network_private_name}, ${network_public_name} - names of private (tenant) and public networks;
|
* ${network_private_name}, ${network_public_name} - names of private (tenant) and public networks;
|
||||||
* ${cluster_name} - name of cluster, which generating from $HOST-$ZUUL_CHANGE-$CLUSTER_HASH. Where:
|
* ${cluster_name} - name of cluster, which generating from $HOST-$ZUUL_CHANGE-$CLUSTER_HASH. Where:
|
||||||
* $HOST - host id (c1 - with neutron, c2 - with nova-network);
|
* $HOST - host id;
|
||||||
* $ZUUL_CHANGE - change number;
|
* $ZUUL_CHANGE - change number;
|
||||||
* $CLUSTER_HASH - hash, which generating for each cluster by using "uuid" python module;
|
* $CLUSTER_HASH - hash, which generating for each cluster by using "uuid" python module;
|
||||||
* ${<plugin>_image} - name of image for each plugin;
|
* ${<plugin>_image} - name of image for each plugin;
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
<%page args="network_public_name=''"/>
|
<%page args="network_public_name=''"/>
|
||||||
|
|
||||||
network:
|
network:
|
||||||
type: '${network_type}'
|
|
||||||
private_network: '${network_private_name}'
|
private_network: '${network_private_name}'
|
||||||
public_network: '${network_public_name}'
|
public_network: '${network_public_name}'
|
||||||
|
|
|
@ -47,7 +47,6 @@ def set_defaults(config):
|
||||||
# set up network
|
# set up network
|
||||||
config['network'] = config.get('network', {})
|
config['network'] = config.get('network', {})
|
||||||
net = config['network']
|
net = config['network']
|
||||||
net['type'] = net.get('type', 'neutron')
|
|
||||||
net['private_network'] = net.get('private_network', 'private')
|
net['private_network'] = net.get('private_network', 'private')
|
||||||
net['auto_assignment_floating_ip'] = net.get('auto_assignment_floating_ip',
|
net['auto_assignment_floating_ip'] = net.get('auto_assignment_floating_ip',
|
||||||
False)
|
False)
|
||||||
|
|
|
@ -81,10 +81,6 @@ SCHEMA = {
|
||||||
"network": {
|
"network": {
|
||||||
"type": "object",
|
"type": "object",
|
||||||
"properties": {
|
"properties": {
|
||||||
"type": {
|
|
||||||
"type": "string",
|
|
||||||
"enum": ["neutron", "nova-network"]
|
|
||||||
},
|
|
||||||
"auto_assignment_floating_ip": {
|
"auto_assignment_floating_ip": {
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
network_type: neutron
|
|
||||||
network_private_name: private
|
network_private_name: private
|
||||||
network_public_name: public
|
network_public_name: public
|
||||||
vanilla_26_image: centos_sahara_vanilla_hadoop_2_6_latest
|
vanilla_26_image: centos_sahara_vanilla_hadoop_2_6_latest
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
network_type: neutron
|
|
||||||
network_private_name: private
|
network_private_name: private
|
||||||
network_public_name: public
|
network_public_name: public
|
||||||
ci_flavor_id: '2'
|
ci_flavor_id: '2'
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
network_type: neutron
|
|
||||||
network_private_name: private
|
network_private_name: private
|
||||||
network_public_name: public
|
network_public_name: public
|
||||||
vanilla_26_image: centos_sahara_vanilla_hadoop_2_6_latest
|
vanilla_26_image: centos_sahara_vanilla_hadoop_2_6_latest
|
||||||
|
|
|
@ -100,8 +100,7 @@ class TestBase(testtools.TestCase):
|
||||||
'ssl_verify': True}
|
'ssl_verify': True}
|
||||||
self.base_scenario.plugin_opts = {'plugin_name': 'vanilla',
|
self.base_scenario.plugin_opts = {'plugin_name': 'vanilla',
|
||||||
'hadoop_version': '2.7.1'}
|
'hadoop_version': '2.7.1'}
|
||||||
self.base_scenario.network = {'type': 'neutron',
|
self.base_scenario.network = {'private_network': 'changed_private',
|
||||||
'private_network': 'changed_private',
|
|
||||||
'public_network': 'changed_public',
|
'public_network': 'changed_public',
|
||||||
'auto_assignment_floating_ip': False}
|
'auto_assignment_floating_ip': False}
|
||||||
self.base_scenario.testcase = {
|
self.base_scenario.testcase = {
|
||||||
|
|
|
@ -61,7 +61,6 @@ class RunnerUnitTest(testtools.TestCase):
|
||||||
|
|
||||||
expected_default_network = {
|
expected_default_network = {
|
||||||
"network": {
|
"network": {
|
||||||
"type": "neutron",
|
|
||||||
"private_network": "private",
|
"private_network": "private",
|
||||||
"public_network": "",
|
"public_network": "",
|
||||||
"auto_assignment_floating_ip": False
|
"auto_assignment_floating_ip": False
|
||||||
|
@ -101,7 +100,6 @@ class RunnerUnitTest(testtools.TestCase):
|
||||||
"ssl_cert": "sahara_tests/unit/scenario/dummy.crt"
|
"ssl_cert": "sahara_tests/unit/scenario/dummy.crt"
|
||||||
},
|
},
|
||||||
"network": {
|
"network": {
|
||||||
"type": "neutron",
|
|
||||||
"private_network": "changed_private",
|
"private_network": "changed_private",
|
||||||
"public_network": "changed_public",
|
"public_network": "changed_public",
|
||||||
"auto_assignment_floating_ip": True,
|
"auto_assignment_floating_ip": True,
|
||||||
|
@ -185,7 +183,6 @@ class RunnerUnitTest(testtools.TestCase):
|
||||||
|
|
||||||
expected_network = {
|
expected_network = {
|
||||||
"network": {
|
"network": {
|
||||||
"type": "neutron",
|
|
||||||
"private_network": "changed_private",
|
"private_network": "changed_private",
|
||||||
"public_network": "changed_public",
|
"public_network": "changed_public",
|
||||||
"auto_assignment_floating_ip": True,
|
"auto_assignment_floating_ip": True,
|
||||||
|
@ -313,7 +310,7 @@ class RunnerUnitTest(testtools.TestCase):
|
||||||
'--os-username', 'demo', '--os-password', 'demopwd',
|
'--os-username', 'demo', '--os-password', 'demopwd',
|
||||||
'--os-project-name', 'demo',
|
'--os-project-name', 'demo',
|
||||||
'--os-auth-url', 'localhost/v2.0',
|
'--os-auth-url', 'localhost/v2.0',
|
||||||
'--args', 'network_type:neutron',
|
'--args',
|
||||||
'network_private_name:private',
|
'network_private_name:private',
|
||||||
'network_public_name:public',
|
'network_public_name:public',
|
||||||
'vanilla_26_image:hadoop_2_6_latest',
|
'vanilla_26_image:hadoop_2_6_latest',
|
||||||
|
@ -337,7 +334,7 @@ class RunnerUnitTest(testtools.TestCase):
|
||||||
'sahara_tests/unit/scenario/templatevars_complete.ini',
|
'sahara_tests/unit/scenario/templatevars_complete.ini',
|
||||||
'sahara_tests/unit/scenario/vanilla2_7_1.yaml.mako',
|
'sahara_tests/unit/scenario/vanilla2_7_1.yaml.mako',
|
||||||
'--args',
|
'--args',
|
||||||
'network_type:test']
|
'network_private_name:']
|
||||||
with testtools.ExpectedException(exceptions.ValidationError):
|
with testtools.ExpectedException(exceptions.ValidationError):
|
||||||
runner.main()
|
runner.main()
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ credentials:
|
||||||
ssl_verify: True
|
ssl_verify: True
|
||||||
|
|
||||||
network:
|
network:
|
||||||
type: ${network_type}
|
|
||||||
private_network: ${network_private_name}
|
private_network: ${network_private_name}
|
||||||
public_network: ${network_public_name}
|
public_network: ${network_public_name}
|
||||||
|
|
||||||
|
|
|
@ -15,16 +15,9 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
export NETWORK=${1:-neutron}
|
|
||||||
export PLUGIN=${2:-fake}
|
export PLUGIN=${2:-fake}
|
||||||
export IS_TRANSIENT=true
|
export IS_TRANSIENT=true
|
||||||
export AUTO_SECURITY_GROUP=true
|
export AUTO_SECURITY_GROUP=true
|
||||||
# Normalize network name
|
|
||||||
if [[ $NETWORK == nova* ]]; then
|
|
||||||
export NETWORK="nova-network"
|
|
||||||
export IS_TRANSIENT=false
|
|
||||||
export AUTO_SECURITY_GROUP=false
|
|
||||||
fi
|
|
||||||
|
|
||||||
export DEST=${DEST:-$BASE/new}
|
export DEST=${DEST:-$BASE/new}
|
||||||
export DEVSTACK_DIR=${DEVSTACK_DIR:-$DEST/devstack}
|
export DEVSTACK_DIR=${DEVSTACK_DIR:-$DEST/devstack}
|
||||||
|
|
|
@ -10,9 +10,3 @@ if [ $SAHARA_SCENARIO_GATE_PROJECT == "python-saharaclient" ] ; then
|
||||||
export PROJECTS="openstack/python-saharaclient $PROJECTS"
|
export PROJECTS="openstack/python-saharaclient $PROJECTS"
|
||||||
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
|
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $SAHARA_SCENARIO_GATE_NETWORK == "nova" ] ; then
|
|
||||||
export DEVSTACK_GATE_NEUTRON=0
|
|
||||||
else
|
|
||||||
export DEVSTACK_GATE_NEUTRON=1
|
|
||||||
fi
|
|
||||||
|
|
|
@ -38,7 +38,6 @@ cd $SAHARA_TESTS_DIR
|
||||||
echo "Generating scenario tests config file"
|
echo "Generating scenario tests config file"
|
||||||
sudo -E -u $USER tee template_vars.ini <<EOF
|
sudo -E -u $USER tee template_vars.ini <<EOF
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
network_type: ${NETWORK}
|
|
||||||
network_private_name: ${PRIVATE_NETWORK_NAME}
|
network_private_name: ${PRIVATE_NETWORK_NAME}
|
||||||
network_public_name: ${PUBLIC_NETWORK_NAME}
|
network_public_name: ${PUBLIC_NETWORK_NAME}
|
||||||
plugin_image: ${SAHARA_IMAGE_NAME}
|
plugin_image: ${SAHARA_IMAGE_NAME}
|
||||||
|
|
|
@ -35,9 +35,4 @@ echo "IMAGE_URLS=$SAHARA_IMAGE" >> $LOCALCONF_PATH
|
||||||
|
|
||||||
echo -e '[[post-config|$SAHARA_CONF_FILE]]\n[DEFAULT]\n' >> $LOCALCONF_PATH
|
echo -e '[[post-config|$SAHARA_CONF_FILE]]\n[DEFAULT]\n' >> $LOCALCONF_PATH
|
||||||
|
|
||||||
|
echo -e 'min_transient_cluster_active_time=90\n' >> $LOCALCONF_PATH
|
||||||
if [ "$NETWORK" == "nova-network" ]; then
|
|
||||||
echo -e 'heat_enable_wait_condition=false\n' >> $LOCALCONF_PATH
|
|
||||||
else
|
|
||||||
echo -e 'min_transient_cluster_active_time=90\n' >> $LOCALCONF_PATH
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in New Issue