X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Flaunchpad%2Fsrc%2Finstantiate%2FinstantiateInputParams.jsx;h=dc40ed6f90187d24314208c90faea16c376d993d;hp=17d5f8ddcc38cb21e278c367869760e328e22d4a;hb=92cf3d6ff7b651dff2ea4935767a8b41bcc677fa;hpb=3d4b8eb085d2edb48661d7c232a31c02ddeef5e6
diff --git a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 17d5f8ddc..dc40ed6f9 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) ?
@@ -286,8 +305,14 @@ export default class InstantiateInputParams extends Component {
);
}
ipProfilesHTML = (props) => {
+ let vldHasIPprofile = false;
+ props.vlds && props.vlds.map(function(v){
+ if(v.type == 'ip-profile-ref') {
+ vldHasIPprofile = true;
+ }
+ })
let ipProfileList = props.ipProfileList;
- return ipProfileList &&
+ return ipProfileList && vldHasIPprofile &&
(
IP Profiles
@@ -401,8 +426,9 @@ export default class InstantiateInputParams extends Component {
{
sshKeysRef.map(function(ref, i) {
+ let keyref = JSON.stringify(ref)
return (
-
+