projects
/
osm
/
UI.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a6a799
)
Revert "RIFT-15669: Launchpad UI - RIFT.ware DEB install - Viewport - service primiti...
03/1203/1
author
KIRAN KASHALKAR
<kiran.kashalkar@riftio.com>
Mon, 27 Feb 2017 20:24:28 +0000
(15:24 -0500)
committer
KIRAN KASHALKAR
<kiran.kashalkar@riftio.com>
Mon, 27 Feb 2017 20:24:28 +0000
(15:24 -0500)
This reverts commit
c2edea79c193c2817fdf42a3b3dca683335dffa7
.
skyquake/plugins/launchpad/api/launchpad.js
patch
|
blob
|
history
skyquake/plugins/launchpad/src/launchpad_card/vnfrConfigPrimitives.jsx
patch
|
blob
|
history
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
patch
|
blob
|
history
skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
patch
|
blob
|
history
diff --git
a/skyquake/plugins/launchpad/api/launchpad.js
b/skyquake/plugins/launchpad/api/launchpad.js
index
688d775
..
6fb0170
100644
(file)
--- a/
skyquake/plugins/launchpad/api/launchpad.js
+++ b/
skyquake/plugins/launchpad/api/launchpad.js
@@
-838,7
+838,7
@@
NSR.addVnfrDataPromise = function(req, nsrs) {
}
}
var vnfrNfviMetrics = buildNfviGraphs(vnfr.vdur, vnfrName);
}
}
var vnfrNfviMetrics = buildNfviGraphs(vnfr.vdur, vnfrName);
- if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
config-primitive'] && vnfr['vnf-configuration']['config
-primitive'].length > 0) {
+ if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
service-primitive'] && vnfr['vnf-configuration']['service
-primitive'].length > 0) {
vnfrObj['service-primitives-present'] = true;
} else {
vnfrObj['service-primitives-present'] = false;
vnfrObj['service-primitives-present'] = true;
} else {
vnfrObj['service-primitives-present'] = false;
@@
-1276,7
+1276,7
@@
VNFR.get = function(req) {
returnData.forEach(function(vnfr) {
vnfr['nfvi-metrics'] = buildNfviGraphs(vnfr.vdur);
vnfr['epa-params'] = epa_aggregator(vnfr.vdur);
returnData.forEach(function(vnfr) {
vnfr['nfvi-metrics'] = buildNfviGraphs(vnfr.vdur);
vnfr['epa-params'] = epa_aggregator(vnfr.vdur);
- vnfr['service-primitives-present'] = (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
config-primitive'] && vnfr['vnf-configuration']['config
-primitive'].length > 0) ? true : false;
+ vnfr['service-primitives-present'] = (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
service-primitive'] && vnfr['vnf-configuration']['service
-primitive'].length > 0) ? true : false;
vnfr['vdur'] && vnfr['vdur'].map(function(vdur, vdurIndex) {
// This console-url is what front-end will hit to generate a real console-url
vdur['console-url'] = 'api/vnfr/' + vnfr.id + '/vdur/' + vdur.id + '/console-url';
vnfr['vdur'] && vnfr['vdur'].map(function(vdur, vdurIndex) {
// This console-url is what front-end will hit to generate a real console-url
vdur['console-url'] = 'api/vnfr/' + vnfr.id + '/vdur/' + vdur.id + '/console-url';
diff --git
a/skyquake/plugins/launchpad/src/launchpad_card/vnfrConfigPrimitives.jsx
b/skyquake/plugins/launchpad/src/launchpad_card/vnfrConfigPrimitives.jsx
index
94ad302
..
d9b7182
100644
(file)
--- a/
skyquake/plugins/launchpad/src/launchpad_card/vnfrConfigPrimitives.jsx
+++ b/
skyquake/plugins/launchpad/src/launchpad_card/vnfrConfigPrimitives.jsx
@@
-46,7
+46,7
@@
handleParamChange = (paramIndex, configPrimitiveIndex, vnfrIndex, e) => {
let vnfrs = this.state.vnfrs;
handleParamChange = (paramIndex, configPrimitiveIndex, vnfrIndex, e) => {
let vnfrs = this.state.vnfrs;
- vnfrs[vnfrIndex]["vnf-configuration"]["
config
-primitive"][configPrimitiveIndex]["parameter"][paramIndex].value = e.target.value
+ vnfrs[vnfrIndex]["vnf-configuration"]["
service
-primitive"][configPrimitiveIndex]["parameter"][paramIndex].value = e.target.value
this.setState({
vnfrs: vnfrs
})
this.setState({
vnfrs: vnfrs
})
@@
-63,8
+63,8
@@
constructConfigPrimitiveTabs = (tabList, tabPanels) => {
let mandatoryFieldValue = 'true';
this.state.vnfrs && this.state.vnfrs.map((vnfr, vnfrIndex) => {
constructConfigPrimitiveTabs = (tabList, tabPanels) => {
let mandatoryFieldValue = 'true';
this.state.vnfrs && this.state.vnfrs.map((vnfr, vnfrIndex) => {
- if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
config-primitive'] && vnfr['vnf-configuration']['config
-primitive'].length > 0) {
- vnfr['vnf-configuration']['
config
-primitive'].map((configPrimitive, configPrimitiveIndex) => {
+ if (vnfr['vnf-configuration'] && vnfr['vnf-configuration']['
service-primitive'] && vnfr['vnf-configuration']['service
-primitive'].length > 0) {
+ vnfr['vnf-configuration']['
service
-primitive'].map((configPrimitive, configPrimitiveIndex) => {
let params = [];
if (configPrimitive['parameter'] && configPrimitive['parameter'].length > 0) {
configPrimitive['parameter'].map((param, paramIndex) => {
let params = [];
if (configPrimitive['parameter'] && configPrimitive['parameter'].length > 0) {
configPrimitive['parameter'].map((param, paramIndex) => {
@@
-123,7
+123,7
@@
return (
<div className="nsConfigPrimitives vnfrConfigPrimitives">
<div className="launchpadCard_title">
return (
<div className="nsConfigPrimitives vnfrConfigPrimitives">
<div className="launchpadCard_title">
-
CONFIG
-PRIMITIVES {displayConfigStatus}
+
SERVICE
-PRIMITIVES {displayConfigStatus}
</div>
<div className={isConfiguring ? 'configuring': 'nsConfigPrimitiveTabs'}>
<Tabs onSelect={this.handleSelect}>
</div>
<div className={isConfiguring ? 'configuring': 'nsConfigPrimitiveTabs'}>
<Tabs onSelect={this.handleSelect}>
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
b/skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
index
31b1ed6
..
50a3585
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordCard.jsx
@@
-329,7
+329,7
@@
export default class RecordCard extends React.Component {
if (this.props.type == 'nsr') {
primitivesTabTitle = 'Service Primitive';
} else if (this.props.type == 'vnfr') {
if (this.props.type == 'nsr') {
primitivesTabTitle = 'Service Primitive';
} else if (this.props.type == 'vnfr') {
- primitivesTabTitle = '
Config
Primitive'
+ primitivesTabTitle = '
Service
Primitive'
}
tabList.push(
}
tabList.push(
diff --git
a/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
b/skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
index
bf64859
..
a7770a7
100644
(file)
--- a/
skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
+++ b/
skyquake/plugins/launchpad/src/recordViewer/recordViewStore.js
@@
-137,7
+137,7
@@
class RecordViewStore {
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
let isValid = true;
let configPrimitiveIndex = data.configPrimitiveIndex;
let payload = {};
let isValid = true;
- let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['
config
-primitive'][configPrimitiveIndex];
+ let configPrimitive = vnfrs[vnfrIndex]['vnf-configuration']['
service
-primitive'][configPrimitiveIndex];
payload['name'] = '';
payload['nsr_id_ref'] = vnfrs[vnfrIndex]['nsr-id-ref'];
payload['name'] = '';
payload['nsr_id_ref'] = vnfrs[vnfrIndex]['nsr-id-ref'];