Merge branch 'master' of https://osm.etsi.org/gerrit/osm/UI

Signed-off-by: KIRAN KASHALKAR <kiran.kashalkar@riftio.com>

diff --combined skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
index 17d5f8d,5f1cc8a..4db4a63
--- 1/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
--- 2/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
+++ b/skyquake/plugins/launchpad/src/instantiate/instantiateInputParams.jsx
@@@ -1,6 -1,6 +1,6 @@@
  
  /*
-  * 
+  *
   *   Copyright 2016 RIFT.IO Inc
   *
   *   Licensed under the Apache License, Version 2.0 (the "License");
@@@ -33,11 -33,20 +33,20 @@@ export default class InstantiateInputPa
        <div className="configure-nsd_section">
          <div className="inputControls">
              <TextInput label="Instance Name" type="text" pattern="^[a-zA-Z0-9_]*$" style={{textAlign:'left'}} onChange={props.updateName} value={props.name}/>
-           <label>Select VIM Account
-             <SelectOption options={constructCloudAccountOptions(props.cloudAccounts)} onChange={props.nsFn.updateSelectedCloudAccount} />
-           </label>
            {
-             isOpenMano(props.selectedCloudAccount) ? this.dataCentersHTML(props.dataCenters[selectedCloudAccount.name], props.nsFn.updateSelectedDataCenter) : null
+             !isOpenMano(props.ro) ?
+               (
+                 <label>Select VIM Account
+                   <SelectOption options={constructCloudAccountOptions(props.cloudAccounts)} onChange={props.nsFn.updateSelectedCloudAccount} />
+                 </label>
+               )
+             : null
+           }
+           {
+             isOpenMano(props.ro) ?
+               dataCentersHTML(props.dataCenters[props.ro.name],
+                               props.nsFn.updateSelectedDataCenter)
+               : null
            }
          </div>
        </div>
@@@ -60,11 -69,21 +69,21 @@@
                  return (
                      <div className="inputControls" key={i}>
                      <h4 className="inputControls-title">VNFD: {v.name}</h4>
-                       <label>Select VIM Account
-                         <SelectOption options={constructCloudAccountOptions(props.cloudAccounts)} initial={true} onChange={props.vnfFn.updateSelectedCloudAccount.bind(v['member-vnf-index'])} defaultValue={defaultValue} />
-                       </label>
+                   {
+                     !isOpenMano(props.ro) ?
+                       (
+                         <label>Select VIM Account
+                           <SelectOption options={constructCloudAccountOptions(props.cloudAccounts)} initial={true} onChange={props.vnfFn.updateSelectedCloudAccount.bind(null, v['member-vnf-index'])} defaultValue={defaultValue} />
+                         </label>
+                       )
+                     : 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 +262,7 @@@
                    let isUnknown = (currentType == 'unknown') || ((currentType != 'vim-network-name') && (currentType != 'ip-profile-ref'));
                    return (
                      <div key={self.props.nsd.id + '-' + i} className="inputControls">
 -                        <h4 className="inputControls-title">VLD: {v['short-name']}</h4>
 +                        <h4 className="inputControls-title">VLD: {v['short-name'] ? v['short-name'] : v['name']}</h4>
                          <div  className="inputControls-radioGroup">
                            <label className="inputControls-radio" style={{display: ipProfileList ? 'flex' : 'none'}}>
                              <input type="radio" name={'vld-' + i } onChange={self.props.vldFn.updateType(i)} checked={!isVIM && !isUnknown} value='ip-profile-ref' />
@@@ -548,22 -567,17 +567,17 @@@ function constructCloudAccountOptions(c
    });
    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 (
        <label>Select Data Center
          <SelectOption options={DataCenterOptions} onChange={onChange} />
@@@ -577,9 -591,6 +591,6 @@@ function isOpenMano(account) 
      if (a.constructor.name == 'String') {
        a = JSON.parse(a);
      }
-     if(a.hasOwnProperty('account')) {
-       a = a.account;
-     }
      return a['account-type'] == 'openmano';
    } else {
      return false;