projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RIFT-15669: Launchpad UI - RIFT.ware DEB install - Viewport - service primitive tab...
[osm/UI.git]
/
skyquake
/
plugins
/
launchpad
/
src
/
recordViewer
/
recordViewStore.js
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
index
fbdae39
..
bf64859
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
@@
-136,15
+136,15
@@
class RecordViewStore {
let vnfrIndex = data.vnfrIndex;
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
let vnfrIndex = data.vnfrIndex;
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
- let isValid =
fals
e;
- let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['
service
-primitive'][configPrimitiveIndex];
+ let isValid =
tru
e;
+ let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['
config
-primitive'][configPrimitiveIndex];
payload['name'] = '';
payload['nsr_id_ref'] = vnfrs[vnfrIndex]['nsr-id-ref'];
payload['vnf-list'] = [];
payload['triggered-by'] = 'vnf-primitive';
let parameters = [];
payload['name'] = '';
payload['nsr_id_ref'] = vnfrs[vnfrIndex]['nsr-id-ref'];
payload['vnf-list'] = [];
payload['triggered-by'] = 'vnf-primitive';
let parameters = [];
- configPrimitive['parameter'].map((parameter) => {
+ configPrimitive['parameter']
&& configPrimitive['parameter']
.map((parameter) => {
if(!isValid) {
isValid = validateParameter(parameter);
}
if(!isValid) {
isValid = validateParameter(parameter);
}
@@
-157,8
+157,11
@@
class RecordViewStore {
let vnfPrimitive = [];
vnfPrimitive[0] = {
name: configPrimitive['name'],
let vnfPrimitive = [];
vnfPrimitive[0] = {
name: configPrimitive['name'],
- index: configPrimitiveIndex,
- parameter: parameters
+ index: configPrimitiveIndex
+ };
+
+ if (parameters.length > 0) {
+ vnfPrimitive[0].parameter = parameters;
}
payload['vnf-list'].push({
}
payload['vnf-list'].push({
@@
-192,12
+195,23
@@
class RecordViewStore {
let parameterList = [];
const filterAndAddByValue = (paramObj) => {
let parameterList = [];
const filterAndAddByValue = (paramObj) => {
+ let nameValuePair = null;
+
if (paramObj['value'] != undefined) {
if (paramObj['value'] != undefined) {
-
parameterList.push(
{
+
nameValuePair =
{
name: paramObj.name,
value: paramObj.value
name: paramObj.name,
value: paramObj.value
- });
+ };
+ } else if (paramObj['default-value'] != undefined) {
+ nameValuePair = {
+ name: paramObj.name,
+ value: paramObj['default-value']
+ }
+ }
+ if (nameValuePair) {
+ parameterList.push(nameValuePair);
}
}
+
return paramObj['value'] != undefined;
}
return paramObj['value'] != undefined;
}
@@
-328,7
+342,6
@@
class RecordViewStore {
triggerEditVirtualLink(params) {
this.editVirtualLink(params);
}
triggerEditVirtualLink(params) {
this.editVirtualLink(params);
}
-
}
}
@@
-397,7
+410,9
@@
function connectionManager(type, connection) {
name: nsrs.name,
id: nsrs.id,
nsd_name: nsrs.nsd_name,
name: nsrs.name,
id: nsrs.id,
nsd_name: nsrs.nsd_name,
- type: 'nsr'
+ type: 'nsr',
+ logo: nsrs.nsd && nsrs.nsd.logo,
+ logoId: nsrs.nsd && nsrs.nsd && nsrs.nsd.id
});
// Scaled VNFRs
});
// Scaled VNFRs
@@
-414,10
+429,13
@@
function connectionManager(type, connection) {
sgInstance['vnfrs'] && sgInstance['vnfrs'].map((vnfr, vnfrIndex) => {
scaledVnfrs.push(vnfr);
sgInstance['vnfrs'] && sgInstance['vnfrs'].map((vnfr, vnfrIndex) => {
scaledVnfrs.push(vnfr);
+ let vnfrObj = _.findWhere(nsrs.vnfrs, {id: vnfr});
scaledVnfNav.vnfr.push({
scaledVnfNav.vnfr.push({
- name:
_.findWhere(nsrs.vnfrs, {id: vnfr})
['short-name'],
+ name:
vnfrObj
['short-name'],
id: vnfr,
id: vnfr,
- type: 'vnfr'
+ type: 'vnfr',
+ logo: vnfrObj['vnfd'] && vnfrObj['vnfd']['logo'],
+ logoId: vnfrObj['vnfd'] && vnfrObj['vnfd']['id']
});
});
nav.push(scaledVnfNav);
});
});
nav.push(scaledVnfNav);
@@
-430,7
+448,9
@@
function connectionManager(type, connection) {
nav.push({
name: vnfr["short-name"],
id: vnfr.id,
nav.push({
name: vnfr["short-name"],
id: vnfr.id,
- type: 'vnfr'
+ type: 'vnfr',
+ logo: vnfr['vnfd'] && vnfr['vnfd']['logo'],
+ logoId: vnfr['vnfd'] && vnfr['vnfd']['id']
});
}
});
});
}
});