X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2Finstantiate%2FinstantiateInputParams.jsx;h=4db4a63bde964143a30ed3bdcd3eacd56558a744;hp=17d5f8ddcc38cb21e278c367869760e328e22d4a;hb=3130c3b976dc11f641bce038fcfa1c101d156f12;hpb=3d4b8eb085d2edb48661d7c232a31c02ddeef5e6
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 17d5f8ddc..4db4a63bd 100644
--- a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@ -1,6 +1,6 @@
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,11 +33,20 @@ export default class InstantiateInputParams extends Component {
-
{
- isOpenMano(props.selectedCloudAccount) ? this.dataCentersHTML(props.dataCenters[selectedCloudAccount.name], props.nsFn.updateSelectedDataCenter) : null
+ !isOpenMano(props.ro) ?
+ (
+
+ )
+ : null
+ }
+ {
+ isOpenMano(props.ro) ?
+ dataCentersHTML(props.dataCenters[props.ro.name],
+ props.nsFn.updateSelectedDataCenter)
+ : null
}
@@ -60,11 +69,21 @@ export default class InstantiateInputParams extends Component {
return (
VNFD: {v.name}
-
+ {
+ !isOpenMano(props.ro) ?
+ (
+
+ )
+ : null
+ }
{
- isOpenMano(defaultValue) ? dataCentersHTML(dataCenters[defaultValue.account.name], props.vnfFn.updateSelectedDataCenter(v['member-vnf-index'])) : null
+ isOpenMano(props.ro) ?
+ dataCentersHTML(
+ props.dataCenters[props.ro.name],
+ props.vnfFn.updateSelectedDataCenter.bind(null, v['member-vnf-index']))
+ : null
}
{
(props.configAgentAccounts && props.configAgentAccounts.length > 0) ?
@@ -548,22 +567,17 @@ function constructCloudAccountOptions(cloudAccounts){
});
return CloudAccountOptions;
}
-function dataCentersHTML(state, onChange) {
+function dataCentersHTML(dataCenters, onChange) {
//Build DataCenter options
//Relook at this, why is it an object?
- let dataCenters = state.dataCenters || [];
- let DataCenterOptions = {};
- if(dataCenters){
- for (let d in dataCenters) {
- DataCenterOptions[d] = dataCenters[d].map(function(dc, index) {
- return {
- label: dc.name,
- value: dc.uuid
- }
- });
+ let DataCenterOptions = [];
+ DataCenterOptions = dataCenters && dataCenters.map(function(dc, index) {
+ return {
+ label: dc.name,
+ value: dc.uuid
}
- }
- if (dataCenters.length > 0) {
+ });
+ if (dataCenters && dataCenters.length > 0) {
return (