Browse Source

Syncing with mitaka dependencies

Change-Id: Ic30bd61b99a20d82da8c0563d9e7230ccee76575
Sumit Naiksatam 3 years ago
parent
commit
e524e6b215
4 changed files with 27 additions and 20 deletions
  1. 2
    2
      gbpui/client.py
  2. 1
    1
      gbpui/static/dashboard/js/horizon.scspec.js
  3. 9
    2
      setup.py
  4. 15
    15
      test-requirements.txt

+ 2
- 2
gbpui/client.py View File

@@ -186,7 +186,7 @@ class ServiceProfile(neutron.NeutronAPIDictWrapper):
186 186
 def policy_target_create(request, **kwargs):
187 187
     body = {'policy_target_group': kwargs}
188 188
     policy_target = gbpclient(request).create_policy_target_group(
189
-        body).get('endpoint_group')
189
+        body).get('policy_target_group')
190 190
     return PTG(policy_target)
191 191
 
192 192
 
@@ -237,7 +237,7 @@ def policy_target_update(request, policy_target_id, **kwargs):
237 237
 def ext_policy_target_create(request, **kwargs):
238 238
     body = {'external_policy': kwargs}
239 239
     policy_target = gbpclient(request).create_external_policy(
240
-        body).get('endpoint_group')
240
+        body).get('external_policy')
241 241
     return ExternalPTG(policy_target)
242 242
 
243 243
 

+ 1
- 1
gbpui/static/dashboard/js/horizon.scspec.js View File

@@ -22,7 +22,7 @@ horizon.Node = {
22 22
     $(this.get_node_element("")).each(function () {
23 23
       var $this = $(this);
24 24
       var $input = $this.children("input");
25
-      var name = horizon.escape_html($this.text().replace(/^\s+/, ""));
25
+      var name = horizon.string.escapeHtml($this.text().replace(/^\s+/, ""));
26 26
       var node_property = {
27 27
         "name": name,
28 28
         "id": $input.attr("id"),

+ 9
- 2
setup.py View File

@@ -1,4 +1,3 @@
1
-#!/usr/bin/env python
2 1
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
3 2
 #
4 3
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +16,14 @@
17 16
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
18 17
 import setuptools
19 18
 
19
+# In python < 2.7.4, a lazy loading of package `pbr` will break
20
+# setuptools if some other modules registered functions in `atexit`.
21
+# solution from: http://bugs.python.org/issue15881#msg170215
22
+try:
23
+    import multiprocessing  # noqa
24
+except ImportError:
25
+    pass
26
+
20 27
 setuptools.setup(
21
-    setup_requires=['pbr'],
28
+    setup_requires=['pbr>=1.8'],
22 29
     pbr=True)

+ 15
- 15
test-requirements.txt View File

@@ -8,23 +8,23 @@
8 8
 #
9 9
 # Hacking should appear first in case something else depends on pep8
10 10
 
11
--e git://github.com/openstack/horizon.git@stable/liberty#egg=horizon
12
-hacking>=0.10.0,<0.11
11
+-e git://github.com/openstack/horizon.git@master#egg=horizon
12
+hacking<0.11,>=0.10.0
13 13
 #
14
-coverage>=3.6
15
-django-nose>=1.2
16
-mock>=1.2
17
-mox3>=0.7.0
18
-nodeenv>=0.9.4 # BSD License
19
-nose
20
-nose-exclude
21
-nosehtmloutput>=0.0.3
22
-nosexcover
23
-openstack.nose-plugin>=0.7
14
+coverage>=3.6 # Apache-2.0
15
+django-nose>=1.2 # BSD
16
+mock>=1.2 # BSD
17
+mox3>=0.7.0 # Apache-2.0
18
+nodeenv>=0.9.4 # BSD License  # BSD
19
+nose # LGPL
20
+nose-exclude # LGPL
21
+nosehtmloutput>=0.0.3 # Apache-2.0
22
+nosexcover # BSD
23
+openstack.nose-plugin>=0.7 # Apache-2.0
24 24
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
25 25
 reno>=0.1.1 # Apache2
26
-selenium
27
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
28
-testtools>=1.4.0
26
+selenium>=2.50.1 # Apache-2.0
27
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
28
+testtools>=1.4.0 # MIT
29 29
 # This also needs xvfb library installed on your OS
30 30
 xvfbwrapper>=0.1.3 #license: MIT

Loading…
Cancel
Save