openstack
/
heat-dashboard
Code Issues Proposed changes

Changes the data field used to populate the E.N. select 

Networks are split into two lists (floating_networks and networks)
server side based on the value of the "router:external" field. This
patch switches which group is used to populate the External Network
select to the one actually housing external networks.

Change-Id: I3c9b6e806a5a219fbd6580e5d8a201b8bdf10913
Story: 2005084
Task: 29668
This commit is contained in:
mareklycka 2019-02-25 15:27:10 +01:00 committed by Marek Lyčka
parent a6eb65c0af
commit 6a6aef59eb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.js
View File

@ -126,9 +126,9 @@
name: item.value
})
}
return $scope.options.networks.concat(resource_networks);
return $scope.options.floating_networks.concat(resource_networks);
}
return $scope.options.networks;
return $scope.options.floating_networks;
}
$scope.get_subnets_options = function(){

1
heat_dashboard/static/dashboard/project/heat_dashboard/template_generator/js/resources/os__neutron__router/os__neutron__router.spec.js
View File

@ -18,6 +18,7 @@
hotgenGlobals.update_resource_options({
networks: [{id: 'network1-id', name: 'network1-id'}],
floating_networks: [{id: 'network2-id', name: 'network2'}],
subnets: [{id: 'subnet1-id', name: 'subnet-id'}]
});
$scope.resource = {};