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
This commit is contained in:
parent
c0f6597c7f
commit
93abeefbbb
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
// This check can be potentially made more restrictive to specifically
|
// This check can be potentially made more restrictive to specifically
|
||||||
// check if policy_target is in the URL
|
// check if policy_target is in the URL
|
||||||
if (launchContextService.launchContext.successUrl != '/dashboard/project/instances/') {
|
if (launchContextService.launchContext.successUrl != '/dashboard/project/instances/' && launchContextService.launchContext.successUrl != '/dashboard/project/network_topology/') {
|
||||||
// Finds and replaces the Network and Port wizard pages with
|
// Finds and replaces the Network and Port wizard pages with
|
||||||
// the GBP wizard page
|
// the GBP wizard page
|
||||||
var networkIndex = -1;
|
var networkIndex = -1;
|
||||||
|
2
tox.ini
2
tox.ini
@ -5,7 +5,7 @@ skipsdist = True
|
|||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install --allow-external netaddr --allow-insecure netaddr -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
setenv = VIRTUAL_ENV={envdir}
|
setenv = VIRTUAL_ENV={envdir}
|
||||||
NOSE_WITH_OPENSTACK=1
|
NOSE_WITH_OPENSTACK=1
|
||||||
NOSE_OPENSTACK_COLOR=1
|
NOSE_OPENSTACK_COLOR=1
|
||||||
|
Loading…
Reference in New Issue
Block a user