X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2Finstantiate%2FinstantiateInputParams.jsx;h=4db4a63bde964143a30ed3bdcd3eacd56558a744;hb=refs%2Fchanges%2F66%2F366%2F1;hp=00397ed9f813f07a0d30e826d01decbb5618ccb6;hpb=e29efc315df33d546237e270470916e26df391d6;p=osm%2FUI.git
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 00397ed9f..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) ?
@@ -243,7 +262,7 @@ export default class InstantiateInputParams extends Component {
let isUnknown = (currentType == 'unknown') || ((currentType != 'vim-network-name') && (currentType != 'ip-profile-ref'));
return (
-
VLD: {v['short-name']}
+
VLD: {v['short-name'] ? v['short-name'] : v['name']}