Fix py3 failures and enable py3 dsvm job
This commit makes sure congress is py35 complaint. Closes-Bug:#1731141 Change-Id: Ie8c4a244a60a56cac5b1e1430648f51546f51d62
This commit is contained in:
parent
42afa8729b
commit
ecc0ad6839
|
@ -17,9 +17,9 @@ from __future__ import print_function
|
|||
from __future__ import division
|
||||
from __future__ import absolute_import
|
||||
|
||||
import json
|
||||
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils as json
|
||||
|
||||
from congress.api import api_utils
|
||||
from congress.api import base
|
||||
|
|
|
@ -17,9 +17,9 @@ from __future__ import print_function
|
|||
from __future__ import division
|
||||
from __future__ import absolute_import
|
||||
|
||||
import json
|
||||
import re
|
||||
|
||||
from oslo_serialization import jsonutils as json
|
||||
import six
|
||||
|
||||
from congress.api import base
|
||||
|
|
|
@ -22,12 +22,12 @@ try:
|
|||
import http.client as httplib
|
||||
except ImportError:
|
||||
import httplib
|
||||
import json
|
||||
import re
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_db import exception as db_exc
|
||||
from oslo_log import log as logging
|
||||
from oslo_serialization import jsonutils as json
|
||||
from oslo_utils import uuidutils
|
||||
import six
|
||||
import webob
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#! /usr/bin/python
|
||||
#! /usr/bin/env python
|
||||
#
|
||||
# Copyright (c) 2014 VMware, Inc. All rights reserved.
|
||||
#
|
||||
|
|
|
@ -61,8 +61,9 @@ class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
|
|||
rule['id'])
|
||||
|
||||
def _create_random_policy():
|
||||
policy_name = "murano_%s" % ''.join(random.choice(string.lowercase)
|
||||
for x in range(10))
|
||||
policy_name = "murano_%s" % ''.join(
|
||||
random.choice(string.ascii_lowercase)
|
||||
for x in range(10))
|
||||
body = {"name": policy_name}
|
||||
resp = self.congress_client.create_policy(body)
|
||||
self.addCleanup(_delete_policy_rules, resp['name'])
|
||||
|
|
|
@ -102,7 +102,7 @@ class TestHA(manager_congress.ScenarioPolicyBase):
|
|||
def start_service(self, name, conf_file):
|
||||
service = '--' + name
|
||||
node = name + '-replica-node'
|
||||
args = ['/usr/bin/python', 'bin/congress-server', service,
|
||||
args = ['bin/congress-server', service,
|
||||
'--node-id', node, '--config-file', conf_file]
|
||||
|
||||
p = subprocess.Popen(args, stdout=subprocess.PIPE,
|
||||
|
|
|
@ -36,13 +36,11 @@
|
|||
disable_service s-proxy
|
||||
# without Swift, c-bak cannot run (in the Gate at least)
|
||||
disable_service c-bak
|
||||
# disable all plug-ins for now except congress
|
||||
# enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer
|
||||
# enable_plugin heat git://git.openstack.org/openstack/heat
|
||||
enable_plugin congress git://git.openstack.org/openstack/congress
|
||||
# enable_plugin murano git://git.openstack.org/openstack/murano
|
||||
# enable_plugin aodh git://git.openstack.org/openstack/aodh
|
||||
# enable_plugin designate git://git.openstack.org/openstack/designate
|
||||
enable_plugin heat git://git.openstack.org/openstack/heat
|
||||
enable_plugin congress git://git.openstack.org/openstack/congress
|
||||
enable_plugin murano git://git.openstack.org/openstack/murano
|
||||
enable_plugin neutron https://git.openstack.org/openstack/neutron
|
||||
# To deploy congress as multi-process (api, pe, datasources)
|
||||
CONGRESS_MULTIPROCESS_DEPLOYMENT=True
|
||||
|
@ -81,9 +79,6 @@
|
|||
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
|
||||
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
|
||||
fi
|
||||
if [ "mysql" == "postgresql" ] ; then
|
||||
export DEVSTACK_GATE_POSTGRES=1
|
||||
fi
|
||||
|
||||
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
|
||||
./safe-devstack-vm-gate-wrap.sh
|
||||
|
|
Loading…
Reference in New Issue