Merge "Fix IPv4 check failure in UT"
This commit is contained in:
commit
e86f44627e
20
.zuul.yaml
20
.zuul.yaml
|
@ -86,7 +86,7 @@
|
||||||
- openstack/blazar-nova
|
- openstack/blazar-nova
|
||||||
- openstack/horizon
|
- openstack/horizon
|
||||||
- openstack/barbican
|
- openstack/barbican
|
||||||
- openstack/ceilometer
|
#- openstack/ceilometer
|
||||||
- openstack/heat
|
- openstack/heat
|
||||||
- openstack/mistral
|
- openstack/mistral
|
||||||
- openstack/mistral-dashboard
|
- openstack/mistral-dashboard
|
||||||
|
@ -187,7 +187,7 @@
|
||||||
tox_install_siblings: false
|
tox_install_siblings: false
|
||||||
controller-tacker:
|
controller-tacker:
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ceilometer: https://opendev.org/openstack/ceilometer
|
#ceilometer: https://opendev.org/openstack/ceilometer
|
||||||
tacker: https://opendev.org/openstack/tacker
|
tacker: https://opendev.org/openstack/tacker
|
||||||
devstack_services:
|
devstack_services:
|
||||||
# OVN services
|
# OVN services
|
||||||
|
@ -197,10 +197,10 @@
|
||||||
# Neutron services
|
# Neutron services
|
||||||
q-ovn-metadata-agent: true
|
q-ovn-metadata-agent: true
|
||||||
# Ceilometer services
|
# Ceilometer services
|
||||||
ceilometer-acompute: false
|
#ceilometer-acompute: false
|
||||||
ceilometer-acentral: true
|
#ceilometer-acentral: true
|
||||||
ceilometer-aipmi: false
|
#ceilometer-aipmi: false
|
||||||
ceilometer-anotification: true
|
#ceilometer-anotification: true
|
||||||
# Tacker services
|
# Tacker services
|
||||||
tacker: true
|
tacker: true
|
||||||
tacker-conductor: true
|
tacker-conductor: true
|
||||||
|
@ -236,7 +236,7 @@
|
||||||
# gnocchi setup would run on every compute nodes (esp. multiple asynchronous calls
|
# gnocchi setup would run on every compute nodes (esp. multiple asynchronous calls
|
||||||
# of recreate_database() would be disastrous). Unused api servers would also be
|
# of recreate_database() would be disastrous). Unused api servers would also be
|
||||||
# deployed on each compute node.
|
# deployed on each compute node.
|
||||||
CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
|
#CEILOMETER_BACKEND: "{% if 'compute' in group_names %}none{% else %}gnocchi{% endif %}"
|
||||||
Q_SERVICE_PLUGIN_CLASSES: "qos,\
|
Q_SERVICE_PLUGIN_CLASSES: "qos,\
|
||||||
networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,\
|
networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,\
|
||||||
neutron.services.qos.qos_plugin.QoSPlugin,\
|
neutron.services.qos.qos_plugin.QoSPlugin,\
|
||||||
|
@ -244,10 +244,10 @@
|
||||||
L2_AGENT_EXTENSIONS: qos
|
L2_AGENT_EXTENSIONS: qos
|
||||||
ENABLE_CHASSIS_AS_GW: false
|
ENABLE_CHASSIS_AS_GW: false
|
||||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
|
||||||
devstack_plugins:
|
#devstack_plugins:
|
||||||
ceilometer: https://opendev.org/openstack/ceilometer
|
#ceilometer: https://opendev.org/openstack/ceilometer
|
||||||
devstack_services:
|
devstack_services:
|
||||||
ceilometer-acompute: true
|
#ceilometer-acompute: true
|
||||||
# To override the parent job's definitions.
|
# To override the parent job's definitions.
|
||||||
tls-proxy: false
|
tls-proxy: false
|
||||||
# OVN services
|
# OVN services
|
||||||
|
|
|
@ -458,7 +458,7 @@ def get_vnf_instantiation_request_body():
|
||||||
{
|
{
|
||||||
"type": "IPV4",
|
"type": "IPV4",
|
||||||
"fixedAddresses": [
|
"fixedAddresses": [
|
||||||
'192.168.11.01',
|
'192.168.11.1',
|
||||||
'192.168.21.202'
|
'192.168.21.202'
|
||||||
],
|
],
|
||||||
"subnetId":
|
"subnetId":
|
||||||
|
|
Loading…
Reference in New Issue