projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RIFT-14651: blank initial value for vnf data centers
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
instantiate
/
instantiateInputParams.jsx
diff --git
a/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index
4db4a63
..
8ccebcb
100644
(file)
--- a/
skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/
skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@
-82,7
+82,7
@@
export default class InstantiateInputParams extends Component {
isOpenMano(props.ro) ?
dataCentersHTML(
props.dataCenters[props.ro.name],
isOpenMano(props.ro) ?
dataCentersHTML(
props.dataCenters[props.ro.name],
- props.vnfFn.updateSelectedDataCenter.bind(null, v['member-vnf-index']))
+ props.vnfFn.updateSelectedDataCenter.bind(null, v['member-vnf-index'])
, true
)
: null
}
{
: null
}
{
@@
-305,8
+305,14
@@
export default class InstantiateInputParams extends Component {
);
}
ipProfilesHTML = (props) => {
);
}
ipProfilesHTML = (props) => {
+ let vldHasIPprofile = false;
+ props.vlds && props.vlds.map(function(v){
+ if(v.type == 'ip-profile-ref') {
+ vldHasIPprofile = true;
+ }
+ })
let ipProfileList = props.ipProfileList;
let ipProfileList = props.ipProfileList;
- return ipProfileList &&
+ return ipProfileList &&
vldHasIPprofile &&
(
<div className="configure-nsd_section">
<h3 className="launchpadCard_title">IP Profiles</h3>
(
<div className="configure-nsd_section">
<h3 className="launchpadCard_title">IP Profiles</h3>
@@
-420,8
+426,9
@@
export default class InstantiateInputParams extends Component {
{
sshKeysRef.map(function(ref, i) {
{
sshKeysRef.map(function(ref, i) {
+ let keyref = JSON.stringify(ref)
return (
return (
- <div key={i} className="inputControls inputControls-sshkeys">
+ <div key={
keyref.name + '-' +
i} className="inputControls inputControls-sshkeys">
<label>
<div>
<SelectOption
<label>
<div>
<SelectOption
@@
-434,13
+441,13
@@
export default class InstantiateInputParams extends Component {
})}
ref="keyPairSelection"
initial={false}
})}
ref="keyPairSelection"
initial={false}
- defaultValue={sshKeysList[0].name}
- onChange={
self.props.updateSsh
KeyRef(i)}>
+ defaultValue={
keyref.name ||
sshKeysList[0].name}
+ onChange={
props.sshFn.update
KeyRef(i)}>
</SelectOption>
</div>
</label>
<label>
</SelectOption>
</div>
</label>
<label>
- <span onClick={
self.props.updateSsh
KeyRef(i, true)} className="removeInput">
+ <span onClick={
props.sshFn.update
KeyRef(i, true)} className="removeInput">
<img src={imgRemove} />
Remove
</span>
<img src={imgRemove} />
Remove
</span>
@@
-452,7
+459,7
@@
export default class InstantiateInputParams extends Component {
<div className="inputControls inputControls-sshkeys ">
<label style={{display: 'flex', 'flexDirection': 'row'}}>
SSH KEY PAIR
<div className="inputControls inputControls-sshkeys ">
<label style={{display: 'flex', 'flexDirection': 'row'}}>
SSH KEY PAIR
- <span onClick={
self.props.updateSsh
KeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
+ <span onClick={
props.sshFn.update
KeyRef().bind(null, {target:{value: JSON.stringify(sshKeysList[0])}})} className="addInput">
<img src={imgAdd} />
ADD
</span>
<img src={imgAdd} />
ADD
</span>
@@
-567,7
+574,7
@@
function constructCloudAccountOptions(cloudAccounts){
});
return CloudAccountOptions;
}
});
return CloudAccountOptions;
}
-function dataCentersHTML(dataCenters, onChange) {
+function dataCentersHTML(dataCenters, onChange
, initial
) {
//Build DataCenter options
//Relook at this, why is it an object?
let DataCenterOptions = [];
//Build DataCenter options
//Relook at this, why is it an object?
let DataCenterOptions = [];
@@
-580,7
+587,7
@@
function dataCentersHTML(dataCenters, onChange) {
if (dataCenters && dataCenters.length > 0) {
return (
<label>Select Data Center
if (dataCenters && dataCenters.length > 0) {
return (
<label>Select Data Center
- <SelectOption options={DataCenterOptions} onChange={onChange} />
+ <SelectOption
initial={!!initial}
options={DataCenterOptions} onChange={onChange} />
</label>
)
}
</label>
)
}