Syncing with mitaka dependencies
Change-Id: Ic30bd61b99a20d82da8c0563d9e7230ccee76575
This commit is contained in:
parent
8b731e1a87
commit
e524e6b215
@ -186,7 +186,7 @@ class ServiceProfile(neutron.NeutronAPIDictWrapper):
|
|||||||
def policy_target_create(request, **kwargs):
|
def policy_target_create(request, **kwargs):
|
||||||
body = {'policy_target_group': kwargs}
|
body = {'policy_target_group': kwargs}
|
||||||
policy_target = gbpclient(request).create_policy_target_group(
|
policy_target = gbpclient(request).create_policy_target_group(
|
||||||
body).get('endpoint_group')
|
body).get('policy_target_group')
|
||||||
return PTG(policy_target)
|
return PTG(policy_target)
|
||||||
|
|
||||||
|
|
||||||
@ -237,7 +237,7 @@ def policy_target_update(request, policy_target_id, **kwargs):
|
|||||||
def ext_policy_target_create(request, **kwargs):
|
def ext_policy_target_create(request, **kwargs):
|
||||||
body = {'external_policy': kwargs}
|
body = {'external_policy': kwargs}
|
||||||
policy_target = gbpclient(request).create_external_policy(
|
policy_target = gbpclient(request).create_external_policy(
|
||||||
body).get('endpoint_group')
|
body).get('external_policy')
|
||||||
return ExternalPTG(policy_target)
|
return ExternalPTG(policy_target)
|
||||||
|
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ horizon.Node = {
|
|||||||
$(this.get_node_element("")).each(function () {
|
$(this.get_node_element("")).each(function () {
|
||||||
var $this = $(this);
|
var $this = $(this);
|
||||||
var $input = $this.children("input");
|
var $input = $this.children("input");
|
||||||
var name = horizon.escape_html($this.text().replace(/^\s+/, ""));
|
var name = horizon.string.escapeHtml($this.text().replace(/^\s+/, ""));
|
||||||
var node_property = {
|
var node_property = {
|
||||||
"name": name,
|
"name": name,
|
||||||
"id": $input.attr("id"),
|
"id": $input.attr("id"),
|
||||||
|
11
setup.py
11
setup.py
@ -1,4 +1,3 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@ -17,6 +16,14 @@
|
|||||||
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
|
||||||
import setuptools
|
import setuptools
|
||||||
|
|
||||||
|
# In python < 2.7.4, a lazy loading of package `pbr` will break
|
||||||
|
# setuptools if some other modules registered functions in `atexit`.
|
||||||
|
# solution from: http://bugs.python.org/issue15881#msg170215
|
||||||
|
try:
|
||||||
|
import multiprocessing # noqa
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
setup_requires=['pbr'],
|
setup_requires=['pbr>=1.8'],
|
||||||
pbr=True)
|
pbr=True)
|
||||||
|
@ -8,23 +8,23 @@
|
|||||||
#
|
#
|
||||||
# Hacking should appear first in case something else depends on pep8
|
# Hacking should appear first in case something else depends on pep8
|
||||||
|
|
||||||
-e git://github.com/openstack/horizon.git@stable/liberty#egg=horizon
|
-e git://github.com/openstack/horizon.git@master#egg=horizon
|
||||||
hacking>=0.10.0,<0.11
|
hacking<0.11,>=0.10.0
|
||||||
#
|
#
|
||||||
coverage>=3.6
|
coverage>=3.6 # Apache-2.0
|
||||||
django-nose>=1.2
|
django-nose>=1.2 # BSD
|
||||||
mock>=1.2
|
mock>=1.2 # BSD
|
||||||
mox3>=0.7.0
|
mox3>=0.7.0 # Apache-2.0
|
||||||
nodeenv>=0.9.4 # BSD License
|
nodeenv>=0.9.4 # BSD License # BSD
|
||||||
nose
|
nose # LGPL
|
||||||
nose-exclude
|
nose-exclude # LGPL
|
||||||
nosehtmloutput>=0.0.3
|
nosehtmloutput>=0.0.3 # Apache-2.0
|
||||||
nosexcover
|
nosexcover # BSD
|
||||||
openstack.nose-plugin>=0.7
|
openstack.nose-plugin>=0.7 # Apache-2.0
|
||||||
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
||||||
reno>=0.1.1 # Apache2
|
reno>=0.1.1 # Apache2
|
||||||
selenium
|
selenium>=2.50.1 # Apache-2.0
|
||||||
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
|
||||||
testtools>=1.4.0
|
testtools>=1.4.0 # MIT
|
||||||
# This also needs xvfb library installed on your OS
|
# This also needs xvfb library installed on your OS
|
||||||
xvfbwrapper>=0.1.3 #license: MIT
|
xvfbwrapper>=0.1.3 #license: MIT
|
||||||
|
Loading…
Reference in New Issue
Block a user