openstack
/
charm-odl-controller
Code Issues Proposed changes

Add support for new ODL release, fixup amulet tests.

This commit is contained in:
James Page 2016-02-19 22:13:41 +00:00
parent 3d9e30fef4 a6805592a0
commit 455df98956
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.yaml
View File

@ -6,7 +6,9 @@ options:
SDN controller profile to configure OpenDayLight for; supported values include
cisco-vpp: Cisco VPP for OpenStack
openvswitch-odl: Open vSwitch OpenDayLight for OpenStack
openvswitch-odl: Open vSwitch OpenDayLight for OpenStack - Helium release
openvswitch-odl-lithium: Open vSwitch OpenDayLight for OpenStack - Lithium release
openvswitch-odl-beryllium: Open vSwitch OpenDayLight for OpenStack - Beryllium release
Only a single profile is supported at any one time.
install-url:

33
hooks/odl_controller_utils.py
View File

@ -30,7 +30,38 @@ PROFILES = {
"openvswitch-odl-lithium": {
"feature:install": ["odl-ovsdb-openstack"],
"port": 8080
}
},
"openvswitch-odl-beryllium": {
"feature:install": ["odl-ovsdb-openstack",
"odl-restconf",
"odl-aaa-authn",
"odl-dlux-all"],
"port": 8080
},
"openvswitch-odl-beryllium-l3": {
"feature:install": ["odl-ovsdb-openstack"],
"port": 8080
},
"openvswitch-odl-beryllium-sfc": {
"feature:install": ["odl-ovsdb-openstack",
"odl-sfc-core",
"odl-sfc-sb-rest",
"odl-sfc-ui",
"odl-sfc-netconf",
"odl-sfc-ovs",
"odl-sfcofl2",
"odl-sfc-test-consumer"],
"port": 8080
},
"openvswitch-odl-beryllium-vpn": {
"feature:install": ["odl-ovsdb-openstack",
"odl-vpnservice-api",
"odl-vpnservice-impl",
"odl-vpnservice-impl-rest",
"odl-vpnservice-impl-ui",
"odl-vpnservice-core"],
"port": 8080
},
}
PROFILES["default"] = PROFILES["openvswitch-odl"]

20
tests/basic_deployment.py
View File

@ -52,16 +52,8 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
{'name': 'keystone'},
{'name': 'nova-cloud-controller'},
{'name': 'neutron-gateway'},
{
'name': 'neutron-api-odl',
'location': 'lp:~openstack-charmers/charms/trusty/'
'neutron-api-odl/vpp',
},
{
'name': 'openvswitch-odl',
'location': 'lp:~openstack-charmers/charms/trusty/'
'openvswitch-odl/trunk',
},
{'name': 'neutron-api-odl'},
{'name': 'openvswitch-odl'},
{'name': 'neutron-api'},
{'name': 'nova-compute'},
{'name': 'glance'},
@ -122,7 +114,7 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
os.environ['AMULET_HTTP_PROXY']
keystone_config = {'admin-password': 'openstack',
'admin-token': 'ubuntutesting'}
nova_cc_config = {'network-manager': 'Quantum',
nova_cc_config = {'network-manager': 'Neutron',
'quantum-security-groups': 'yes'}
configs = {'neutron-gateway': neutron_gateway_config,
'neutron-api': neutron_api_config,
@ -196,9 +188,7 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
'neutron-metering-agent',
'neutron-l3-agent']
nova_cc_services = ['nova-api-ec2',
'nova-api-os-compute',
'nova-objectstore',
nova_cc_services = ['nova-api-os-compute',
'nova-cert',
'nova-scheduler',
'nova-conductor']
@ -267,7 +257,7 @@ class ODLControllerBasicDeployment(OpenStackAmuletDeployment):
'tenantId': u.not_null,
'id': u.not_null,
'email': 'juju@localhost'},
{'name': 'quantum',
{'name': 'neutron',
'enabled': True,
'tenantId': u.not_null,
'id': u.not_null,