← Back to branch summary

~gnuoy/charms/trusty/odl-controller/amulet

« back to all changes in this revision

Viewing changes to tests/basic_deployment.py

  • Committer: Liam Young
  • Date: 2015-11-11 12:42:06 UTC
  • Revision ID: liam.young@canonical.com-20151111124206-7k08qcy35q2n808p
Fix tests inlight of Ryans feedback

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/basic_deployment.py
2
2
 
3
3
import amulet
4
4
import os
5
 
import time
6
5
 
7
6
from neutronclient.v2_0 import client as neutronclient
8
7
 
32
31
        self._add_relations()
33
32
        self._configure_services()
34
33
        self._deploy()
 
34
        exclude_services = ['mysql', 'odl-controller', 'neutron-api-odl']
 
35
        self._auto_wait_for_status(exclude_services=exclude_services)
35
36
        self._initialize_tests()
36
37
 
37
38
    def _add_services(self):
109
110
        neutron_api_config = {'neutron-security-groups': 'False',
110
111
                              'manage-neutron-plugin-legacy-mode': 'False'}
111
112
        neutron_api_odl_config = {'overlay-network-type': 'vxlan gre'}
112
 
#        karaf_file_location = ('http://nexus.opendaylight.org/content/groups/'
113
 
#                               'public/org/opendaylight/integration/'
114
 
#                               'distribution-karaf/0.2.3-Helium-SR3/'
115
 
#                               'distribution-karaf-0.2.3-Helium-SR3.tar.gz')
116
 
        # XXX LY Charm does not currently support using a proxy to download
117
 
        #        distribution tar ball
118
 
        karaf_file_location = ('http://10.245.161.162/swift/v1/opendaylight/'
119
 
                               'distribution-karaf-0.2.3-Helium-SR3.tar.gz')
120
 
        odl_controller_config = {
121
 
            'install-url': karaf_file_location,
122
 
        }
 
113
        odl_controller_config = {}
123
114
        if os.environ.get('AMULET_HTTP_PROXY'):
124
115
            odl_controller_config['http-proxy'] = \
125
116
                os.environ['AMULET_HTTP_PROXY']
126
 
        if os.environ.get('AMULET_HTTPS_PROXY'):
 
117
        if os.environ.get('AMULET_HTTP_PROXY'):
127
118
            odl_controller_config['https-proxy'] = \
128
 
                os.environ['AMULET_HTTPS_PROXY']
 
119
                os.environ['AMULET_HTTP_PROXY']
129
120
        keystone_config = {'admin-password': 'openstack',
130
121
                           'admin-token': 'ubuntutesting'}
131
122
        nova_cc_config = {'network-manager': 'Quantum',
151
142
        self.neutron_api_odl_sentry = self.d.sentry['neutron-api-odl'][0]
152
143
        self.openvswitch_odl_sentry = self.d.sentry['openvswitch-odl'][0]
153
144
 
154
 
        # Let things settle a bit before moving forward
155
 
        time.sleep(30)
156
 
 
157
145
        # Authenticate admin with keystone
158
146
        self.keystone = u.authenticate_keystone_admin(self.keystone_sentry,
159
147
                                                      user='admin',