Browse Source

Fix patching of create instance dialog (part deux)

Patching of the create instance dialog needs to happen
only when invoked from the GBP "create member" workflow.
An earlier commit c0f6597c7f
fixed this for launching from the Compute menu but left out
the launching option from the Network Topology (under
the Network option).

An attempt was made to change the logic in a way that the check
happens for the GBP URI (instead of the logic to check for all
other URIs from where it can be launched), however that did not
work. Hence the comment on evolving to a more resrtictive logic
has been preserved in the code.

Also fixes tox.ini

Change-Id: If124971c1954cb85fce244440e2408cd58ced3e6
Sumit Naiksatam 11 months ago
parent
commit
93abeefbbb

+ 1
- 1
gbpui/static/dashboard/gbpui/group-member/group-member-launch-instance.patcher.js View File

@@ -39,7 +39,7 @@
39 39
 
40 40
                 // This check can be potentially made more restrictive to specifically
41 41
                 // check if policy_target is in the URL
42
-                if (launchContextService.launchContext.successUrl != '/dashboard/project/instances/') {
42
+                if (launchContextService.launchContext.successUrl != '/dashboard/project/instances/' && launchContextService.launchContext.successUrl != '/dashboard/project/network_topology/') {
43 43
                     // Finds and replaces the Network and Port wizard pages with
44 44
                     // the GBP wizard page
45 45
                     var networkIndex = -1;

+ 1
- 1
tox.ini View File

@@ -5,7 +5,7 @@ skipsdist = True
5 5
 
6 6
 [testenv]
7 7
 usedevelop = True
8
-install_command = pip install --allow-external netaddr --allow-insecure netaddr -U {opts} {packages}
8
+install_command = pip install -U {opts} {packages}
9 9
 setenv = VIRTUAL_ENV={envdir}
10 10
          NOSE_WITH_OPENSTACK=1
11 11
          NOSE_OPENSTACK_COLOR=1

Loading…
Cancel
Save