summaryrefslogtreecommitdiffstats
path: root/ui-react
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-02-18 02:00:11 -0800
committerSébastien Determe <sebastien.determe@intl.att.com>2020-02-25 10:57:35 +0000
commitaa486be66b1c29ad2e953cb44d105ca1bde40b1c (patch)
treeb5893560b1eee8f1e456104deec7924f05e4fbfb /ui-react
parent4e8e11afced0693e24074fd6bb8d5b2cace98ab6 (diff)
Modify the Ui
Modify the Ui to have a modify option in the menu so that the user can tune the loop instance Issue-ID: CLAMP-648 Change-Id: I57523bc1c3afaf5ca5a2acf5c59823df06fd4cd9 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'ui-react')
-rw-r--r--ui-react/src/LoopUI.js3
-rw-r--r--ui-react/src/__snapshots__/LoopUI.test.js.snap4
-rw-r--r--ui-react/src/__snapshots__/OnapClamp.test.js.snap4
-rw-r--r--ui-react/src/api/LoopService.js23
-rw-r--r--ui-react/src/api/PolicyToscaService.js136
-rw-r--r--ui-react/src/api/TemplateMenuService.js105
-rw-r--r--ui-react/src/api/TemplateService.js41
-rw-r--r--ui-react/src/api/example.json417
-rw-r--r--ui-react/src/components/dialogs/Loop/ModifyLoopModal.js187
-rw-r--r--ui-react/src/components/dialogs/Loop/OpenLoopModal.js9
-rw-r--r--ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js26
-rw-r--r--ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js4
-rw-r--r--ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js10
-rw-r--r--ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap6
-rw-r--r--ui-react/src/components/menu/MenuBar.js37
-rw-r--r--ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap117
16 files changed, 526 insertions, 603 deletions
diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js
index b76f26400..7f07f3438 100644
--- a/ui-react/src/LoopUI.js
+++ b/ui-react/src/LoopUI.js
@@ -38,6 +38,7 @@ import LoopActionService from './api/LoopActionService';
import { Route } from 'react-router-dom'
import OpenLoopModal from './components/dialogs/Loop/OpenLoopModal';
+import ModifyLoopModal from './components/dialogs/Loop/ModifyLoopModal';
import OperationalPolicyModal from './components/dialogs/OperationalPolicy/OperationalPolicyModal';
import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal';
import LoopPropertiesModal from './components/dialogs/Loop/LoopPropertiesModal';
@@ -257,6 +258,8 @@ export default class LoopUI extends React.Component {
<Route path="/configurationPolicyModal/:componentName" render={(routeProps) => (<ConfigurationPolicyModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
<Route path="/openLoop" render={(routeProps) => (<OpenLoopModal {...routeProps} loadLoopFunction={this.loadLoop} />)} />
<Route path="/loopProperties" render={(routeProps) => (<LoopPropertiesModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+ <Route path="/modifyLoop" render={(routeProps) => (<ModifyLoopModal {...routeProps} loopCache={this.getLoopCache()} loadLoopFunction={this.loadLoop}/>)} />
+
<Route path="/userInfo" render={(routeProps) => (<UserInfoModal {...routeProps} />)} />
<Route path="/closeLoop" render={this.closeLoop} />
<Route path="/submit" render={(routeProps) => (<PerformAction {...routeProps} loopAction="submit" loopCache={this.getLoopCache()} updateLoopFunction={this.updateLoopCache} showAlert={this.showAlert}/>)} />
diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap
index 98f1a460b..98f802df8 100644
--- a/ui-react/src/__snapshots__/LoopUI.test.js.snap
+++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap
@@ -33,6 +33,10 @@ exports[`Verify LoopUI Test the render method 1`] = `
render={[Function]}
/>
<Route
+ path="/modifyLoop"
+ render={[Function]}
+ />
+ <Route
path="/userInfo"
render={[Function]}
/>
diff --git a/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
index 59a6fd45e..35951caa4 100644
--- a/ui-react/src/__snapshots__/OnapClamp.test.js.snap
+++ b/ui-react/src/__snapshots__/OnapClamp.test.js.snap
@@ -58,6 +58,10 @@ exports[`Verify OnapClamp Test the render method 1`] = `
render={[Function]}
/>
<Route
+ path="/modifyLoop"
+ render={[Function]}
+ />
+ <Route
path="/userInfo"
render={[Function]}
/>
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index ead2cf80c..432eabecd 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -175,4 +175,27 @@ export default class LoopService {
return {};
});
}
+
+ static addOperationalPolicyType(loopName, policyType, policyVersion) {
+ return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+ method: 'PUT',
+ headers: {
+ "Content-Type": "application/json"
+ },
+ credentials: 'same-origin'
+ })
+ .then(function (response) {
+ console.debug("Add Operational Policy response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("Add Operational Policy query failed");
+ return {};
+ }
+ })
+ .catch(function (error) {
+ console.error("Add Operational Policy error received", error);
+ return {};
+ });
+ }
}
diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js
new file mode 100644
index 000000000..52e68fac4
--- /dev/null
+++ b/ui-react/src/api/PolicyToscaService.js
@@ -0,0 +1,136 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class PolicyToscaService {
+ static getToscaPolicyModels() {
+ return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
+ .then(function (response) {
+ console.debug("getToscaPolicyModels response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("getToscaPolicyModels query failed");
+ return {};
+ }
+ })
+ .catch(function (error) {
+ console.error("getToscaPolicyModels error received", error);
+ return {};
+ });
+ }
+
+ static getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
+ return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType + "/" + policyModelVersion, {
+ method: 'GET',
+ credentials: 'same-origin'
+ })
+ .then(function (response) {
+ console.debug("getToscaPolicyModelYaml response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("getToscaPolicyModelYaml query failed");
+ return "";
+ }
+ })
+ .catch(function (error) {
+ console.error("getToscaPolicyModelYaml error received", error);
+ return "";
+ });
+ }
+
+ static getToscaPolicyModel(policyModelType, policyModelVersion) {
+ return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + "/" + policyModelVersion, {
+ method: 'GET',
+ credentials: 'same-origin'
+ })
+ .then(function (response) {
+ console.debug("getToscaPolicyModel response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("getToscaPolicyModel query failed");
+ return "";
+ }
+ })
+ .catch(function (error) {
+ console.error("getToscaPolicyModel error received", error);
+ return "";
+ });
+ }
+
+ static createPolicyModelFromToscaModel(policyModelType, jsonData) {
+ return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
+ method: 'POST',
+ credentials: 'same-origin',
+ headers: {
+ "Content-Type": "a",
+ },
+ body: JSON.stringify(jsonData)
+ })
+ .then(function(response) {
+ console.debug("createPolicyModelFromToscaModel response received: ", response.status);
+ if (response.ok) {
+ var message = {
+ status: response.status,
+ message: 'Tosca Policy Model successfully uploaded'
+ };
+ return message;
+ } else {
+ console.error("createPolicyModelFromToscaModel failed");
+ return response.text();
+ }
+ })
+ .catch(function(error) {
+ console.error("createPolicyModelFromToscaModel error received", error);
+ return "";
+ });
+ }
+
+ static updatePolicyModelTosca(policyModelType, policyModelVersion, jsonData) {
+ return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, {
+ method: 'PUT',
+ credentials: 'same-origin',
+ headers: {
+ "Content-Type": "a",
+ },
+ body: JSON.stringify(jsonData)
+ })
+ .then(function(response) {
+ console.debug("updatePolicyModelTosca response received: ", response.status);
+ if (response.ok) {
+ var message = {
+ status: response.status,
+ message: 'Tosca Policy Model successfully uploaded'
+ };
+ return message;
+ } else {
+ console.error("updatePolicyModelTosca failed");
+ return response.text();
+ }
+ })
+ .catch(function(error) {
+ console.error("updatePolicyModelTosca error received", error);
+ return "";
+ });
+ }
+}
diff --git a/ui-react/src/api/TemplateMenuService.js b/ui-react/src/api/TemplateMenuService.js
deleted file mode 100644
index 0dabebdd1..000000000
--- a/ui-react/src/api/TemplateMenuService.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-export default class TemplateMenuService {
- static getToscaPolicyModels() {
- return fetch('restservices/clds/v2/policyToscaModels', { method: 'GET', credentials: 'same-origin' })
- .then(function (response) {
- console.debug("getToscaPolicyModels response received: ", response.status);
- if (response.ok) {
- return response.json();
- } else {
- console.error("getToscaPolicyModels query failed");
- return {};
- }
- })
- .catch(function (error) {
- console.error("getToscaPolicyModels error received", error);
- return {};
- });
- }
-
- static getToscaPolicyModelYaml(policyModelType) {
- return fetch('/restservices/clds/v2/policyToscaModels/yaml/' + policyModelType, {
- method: 'GET',
- credentials: 'same-origin'
- })
- .then(function (response) {
- console.debug("getToscaPolicyModelYaml response received: ", response.status);
- if (response.ok) {
- return response.json();
- } else {
- console.error("getToscaPolicyModelYaml query failed");
- return "";
- }
- })
- .catch(function (error) {
- console.error("getToscaPolicyModelYaml error received", error);
- return "";
- });
- }
-
- static uploadToscaPolicyModal(policyModelType, jsonData) {
- return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, {
- method: 'PUT',
- credentials: 'same-origin',
- headers: {
- "Content-Type": "a",
- },
- body: JSON.stringify(jsonData)
- })
- .then(function(response) {
- console.debug("uploadToscaPolicyModal response received: ", response.status);
- if (response.ok) {
- var message = {
- status: response.status,
- message: 'Tosca Policy Model successfully uploaded'
- };
- return message;
- } else {
- console.error("uploadToscaPolicyModal failed");
- return response.text();
- }
- })
- .catch(function(error) {
- console.error("uploadToscaPolicyModal error received", error);
- return "";
- });
- }
-
- static getBlueprintMicroServiceTemplates() {
- return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
- .then(function (response) {
- console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
- if (response.ok) {
- return response.json();
- } else {
- console.error("getBlueprintMicroServiceTemplates query failed");
- return {};
- }
- })
- .catch(function (error) {
- console.error("getBlueprintMicroServiceTemplates error received", error);
- return {};
- });
- }
-}
diff --git a/ui-react/src/api/TemplateService.js b/ui-react/src/api/TemplateService.js
new file mode 100644
index 000000000..10e0b5427
--- /dev/null
+++ b/ui-react/src/api/TemplateService.js
@@ -0,0 +1,41 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+export default class TemplateService {
+
+ static getBlueprintMicroServiceTemplates() {
+ return fetch('restservices/clds/v2/templates', { method: 'GET', credentials: 'same-origin', })
+ .then(function (response) {
+ console.debug("getBlueprintMicroServiceTemplates response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("getBlueprintMicroServiceTemplates query failed");
+ return {};
+ }
+ })
+ .catch(function (error) {
+ console.error("getBlueprintMicroServiceTemplates error received", error);
+ return {};
+ });
+ }
+}
diff --git a/ui-react/src/api/example.json b/ui-react/src/api/example.json
deleted file mode 100644
index 7b9a95a23..000000000
--- a/ui-react/src/api/example.json
+++ /dev/null
@@ -1,417 +0,0 @@
-{
- "name": "LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca",
- "dcaeBlueprintId": "typeId-3a942643-a8f7-4e54-b2c1-eea8daba2b17",
- "globalPropertiesJson": {
- "dcaeDeployParameters": {
- "location_id": "",
- "service_id": "",
- "policy_id": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca"
- }
- },
- "modelService": {
- "serviceDetails": {
- "serviceType": "",
- "namingPolicy": "",
- "environmentContext": "General_Revenue-Bearing",
- "serviceEcompNaming": "true",
- "serviceRole": "",
- "name": "vLoadBalancerMS",
- "description": "vLBMS",
- "invariantUUID": "30ec5b59-4799-48d8-ac5f-1058a6b0e48f",
- "ecompGeneratedNaming": "true",
- "category": "Network L4+",
- "type": "Service",
- "UUID": "63cac700-ab9a-4115-a74f-7eac85e3fce0",
- "instantiationType": "A-la-carte"
- },
- "resourceDetails": {
- "CP": {},
- "VL": {},
- "VF": {
- "vLoadBalancerMS 0": {
- "resourceVendor": "Test",
- "resourceVendorModelNumber": "",
- "name": "vLoadBalancerMS",
- "description": "vLBMS",
- "invariantUUID": "1a31b9f2-e50d-43b7-89b3-a040250cf506",
- "subcategory": "Load Balancer",
- "category": "Application L4+",
- "type": "VF",
- "UUID": "b4c4f3d7-929e-4b6d-a1cd-57e952ddc3e6",
- "version": "1.0",
- "resourceVendorRelease": "1.0",
- "customizationUUID": "465246dc-7748-45f4-a013-308d92922552"
- }
- },
- "CR": {},
- "VFC": {},
- "PNF": {},
- "Service": {},
- "CVFC": {},
- "Service Proxy": {},
- "Configuration": {},
- "AllottedResource": {},
- "VFModule": {
- "Vloadbalancerms..vpkg..module-1": {
- "vfModuleModelInvariantUUID": "ca052563-eb92-4b5b-ad41-9111768ce043",
- "vfModuleModelVersion": "1",
- "vfModuleModelName": "Vloadbalancerms..vpkg..module-1",
- "vfModuleModelUUID": "1e725ccc-b823-4f67-82b9-4f4367070dbc",
- "vfModuleModelCustomizationUUID": "1bffdc31-a37d-4dee-b65c-dde623a76e52",
- "min_vf_module_instances": 0,
- "vf_module_label": "vpkg",
- "max_vf_module_instances": 1,
- "vf_module_type": "Expansion",
- "isBase": false,
- "initial_count": 0,
- "volume_group": false
- },
- "Vloadbalancerms..vdns..module-3": {
- "vfModuleModelInvariantUUID": "4c10ba9b-f88f-415e-9de3-5d33336047fa",
- "vfModuleModelVersion": "1",
- "vfModuleModelName": "Vloadbalancerms..vdns..module-3",
- "vfModuleModelUUID": "4fa73b49-8a6c-493e-816b-eb401567b720",
- "vfModuleModelCustomizationUUID": "bafcdab0-801d-4d81-9ead-f464640a38b1",
- "min_vf_module_instances": 0,
- "vf_module_label": "vdns",
- "max_vf_module_instances": 50,
- "vf_module_type": "Expansion",
- "isBase": false,
- "initial_count": 0,
- "volume_group": false
- },
- "Vloadbalancerms..base_template..module-0": {
- "vfModuleModelInvariantUUID": "921f7c96-ebdd-42e6-81b9-1cfc0c9796f3",
- "vfModuleModelVersion": "1",
- "vfModuleModelName": "Vloadbalancerms..base_template..module-0",
- "vfModuleModelUUID": "63734409-f745-4e4d-a38b-131638a0edce",
- "vfModuleModelCustomizationUUID": "86baddea-c730-4fb8-9410-cd2e17fd7f27",
- "min_vf_module_instances": 1,
- "vf_module_label": "base_template",
- "max_vf_module_instances": 1,
- "vf_module_type": "Base",
- "isBase": true,
- "initial_count": 1,
- "volume_group": false
- },
- "Vloadbalancerms..vlb..module-2": {
- "vfModuleModelInvariantUUID": "a772a1f4-0064-412c-833d-4749b15828dd",
- "vfModuleModelVersion": "1",
- "vfModuleModelName": "Vloadbalancerms..vlb..module-2",
- "vfModuleModelUUID": "0f5c3f6a-650a-4303-abb6-fff3e573a07a",
- "vfModuleModelCustomizationUUID": "96a78aad-4ffb-4ef0-9c4f-deb03bf1d806",
- "min_vf_module_instances": 0,
- "vf_module_label": "vlb",
- "max_vf_module_instances": 1,
- "vf_module_type": "Expansion",
- "isBase": false,
- "initial_count": 0,
- "volume_group": false
- }
- }
- }
- },
- "lastComputedState": "DESIGN",
- "components": {
- "POLICY": {
- "componentState": {
- "stateName": "NOT_SENT",
- "description": "The policies defined have NOT yet been created on the policy engine"
- }
- },
- "DCAE": {
- "componentState": {
- "stateName": "BLUEPRINT_DEPLOYED",
- "description": "The DCAE blueprint has been found in the DCAE inventory but not yet instancianted for this loop"
- }
- }
- },
- "operationalPolicies": [
- {
- "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
- "configurationsJson": {
- "guard_policies": {
- "guard.minmax.new": {
- "recipe": "",
- "clname": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca",
- "actor": "",
- "targets": "",
- "min": "gg",
- "max": "gg",
- "limit": "",
- "timeUnits": "",
- "timeWindow": "",
- "guardActiveStart": "00:00:00Z",
- "guardActiveEnd": "00:00:01Z"
- }
- },
- "operational_policy": {
- "controlLoop": {
- "trigger_policy": "new",
- "timeout": "0",
- "abatement": "false",
- "controlLoopName": "LOOP_h2NMX_v1_0_ResourceInstanceName1_tca"
- },
- "policies": [
- {
- "id": "new",
- "recipe": "",
- "retry": "0",
- "timeout": "0",
- "actor": "",
- "payload": "",
- "success": "",
- "failure": "",
- "failure_timeout": "",
- "failure_retries": "",
- "failure_exception": "",
- "failure_guard": "",
- "target": {
- "type": "VM",
- "resourceID": ""
- }
- }
- ]
- }
- }
- }
- ],
- "microServicePolicies": [
- {
- "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
- "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
- "properties": {
- "domain": "measurementsForVfScaling",
- "metricsPerEventName": [
- {
- "policyVersion": "ff",
- "thresholds": [
- {
- "severity": "CRITICAL",
- "fieldPath": "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
- "thresholdValue": 0,
- "closedLoopEventStatus": "ONSET",
- "closedLoopControlName": "ff",
- "version": "ff",
- "direction": "LESS"
- }
- ],
- "policyName": "ff",
- "controlLoopSchemaType": "VM",
- "policyScope": "ff",
- "eventName": "ff"
- }
- ]
- },
- "shared": false,
- "jsonRepresentation": {
- "schema": {
- "uniqueItems": "true",
- "format": "tabs-top",
- "type": "array",
- "title": "TCA Policy JSON",
- "items": {
- "type": "object",
- "title": "TCA Policy JSON",
- "required": [
- "domain",
- "metricsPerEventName"
- ],
- "properties": {
- "domain": {
- "propertyOrder": 1001,
- "default": "measurementsForVfScaling",
- "title": "Domain name to which TCA needs to be applied",
- "type": "string"
- },
- "metricsPerEventName": {
- "propertyOrder": 1002,
- "uniqueItems": "true",
- "format": "tabs-top",
- "title": "Contains eventName and threshold details that need to be applied to given eventName",
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "controlLoopSchemaType",
- "eventName",
- "policyName",
- "policyScope",
- "policyVersion",
- "thresholds"
- ],
- "properties": {
- "policyVersion": {
- "propertyOrder": 1007,
- "title": "TCA Policy Scope Version",
- "type": "string"
- },
- "thresholds": {
- "propertyOrder": 1008,
- "uniqueItems": "true",
- "format": "tabs-top",
- "title": "Thresholds associated with eventName",
- "type": "array",
- "items": {
- "type": "object",
- "required": [
- "closedLoopControlName",
- "closedLoopEventStatus",
- "direction",
- "fieldPath",
- "severity",
- "thresholdValue",
- "version"
- ],
- "properties": {
- "severity": {
- "propertyOrder": 1013,
- "title": "Threshold Event Severity",
- "type": "string",
- "enum": [
- "CRITICAL",
- "MAJOR",
- "MINOR",
- "WARNING",
- "NORMAL"
- ]
- },
- "fieldPath": {
- "propertyOrder": 1012,
- "title": "Json field Path as per CEF message which needs to be analyzed for TCA",
- "type": "string",
- "enum": [
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",
- "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",
- "$.event.measurementsForVfScalingFields.meanRequestLatency",
- "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",
- "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",
- "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",
- "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",
- "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",
- "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"
- ]
- },
- "thresholdValue": {
- "propertyOrder": 1014,
- "title": "Threshold value for the field Path inside CEF message",
- "type": "integer"
- },
- "closedLoopEventStatus": {
- "propertyOrder": 1010,
- "title": "Closed Loop Event Status of the threshold",
- "type": "string",
- "enum": [
- "ONSET",
- "ABATED"
- ]
- },
- "closedLoopControlName": {
- "propertyOrder": 1009,
- "title": "Closed Loop Control Name associated with the threshold",
- "type": "string"
- },
- "version": {
- "propertyOrder": 1015,
- "title": "Version number associated with the threshold",
- "type": "string"
- },
- "direction": {
- "propertyOrder": 1011,
- "title": "Direction of the threshold",
- "type": "string",
- "enum": [
- "LESS",
- "LESS_OR_EQUAL",
- "GREATER",
- "GREATER_OR_EQUAL",
- "EQUAL"
- ]
- }
- }
- }
- },
- "policyName": {
- "propertyOrder": 1005,
- "title": "TCA Policy Scope Name",
- "type": "string"
- },
- "controlLoopSchemaType": {
- "propertyOrder": 1003,
- "title": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",
- "type": "string",
- "enum": [
- "VM",
- "VNF"
- ]
- },
- "policyScope": {
- "propertyOrder": 1006,
- "title": "TCA Policy Scope",
- "type": "string"
- },
- "eventName": {
- "propertyOrder": 1004,
- "title": "Event name to which thresholds need to be applied",
- "type": "string"
- }
- }
- }
- }
- }
- }
- }
- }
- }
- ],
- "loopLogs": [
- {
- "id": 2,
- "logType": "INFO",
- "logComponent": "CLAMP",
- "message": "Micro Service policies UPDATED",
- "logInstant": "2019-07-08T09:44:53Z"
- },
- {
- "id": 1,
- "logType": "INFO",
- "logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
- "logInstant": "2019-07-08T09:44:37Z"
- }
- ]
-}
diff --git a/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
new file mode 100644
index 000000000..4cd21fdb5
--- /dev/null
+++ b/ui-react/src/components/dialogs/Loop/ModifyLoopModal.js
@@ -0,0 +1,187 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2020 AT&T Intellectual Property. All rights
+ * reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+import React, { forwardRef } from 'react'
+import MaterialTable from "material-table";
+import Button from 'react-bootstrap/Button';
+import Modal from 'react-bootstrap/Modal';
+import styled from 'styled-components';
+import PolicyToscaService from '../../../api/PolicyToscaService';
+import ArrowUpward from '@material-ui/icons/ArrowUpward';
+import ChevronLeft from '@material-ui/icons/ChevronLeft';
+import ChevronRight from '@material-ui/icons/ChevronRight';
+import Clear from '@material-ui/icons/Clear';
+import FirstPage from '@material-ui/icons/FirstPage';
+import LastPage from '@material-ui/icons/LastPage';
+import Search from '@material-ui/icons/Search';
+import LoopService from '../../../api/LoopService';
+
+
+const ModalStyled = styled(Modal)`
+ background-color: transparent;
+`
+const TextModal = styled.textarea`
+ margin-top: 20px;
+ white-space:pre;
+ background-color: ${props => props.theme.toscaTextareaBackgroundColor};
+ text-align: justify;
+ font-size: ${props => props.theme.toscaTextareaFontSize};
+ width: 100%;
+ height: 300px;
+`
+const cellStyle = { border: '1px solid black' };
+const headerStyle = { backgroundColor: '#ddd', border: '2px solid black' };
+const rowHeaderStyle = {backgroundColor:'#ddd', fontSize: '15pt', text: 'bold', border: '1px solid black'};
+
+export default class ModifyLoopModal extends React.Component {
+
+ state = {
+ show: true,
+ loopCache: this.props.loopCache,
+ content: 'Please select Tosca model to view the details',
+ selectedRowData: {},
+ toscaPolicyModelsData: [],
+ toscaColumns: [
+ { title: "#", field: "index", render: rowData => rowData.tableData.id + 1,
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Policy Model Type", field: "policyModelType",
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Policy Acronym", field: "policyAcronym",
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Version", field: "version",
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Uploaded By", field: "updatedBy",
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Uploaded Date", field: "updatedDate", editable: 'never',
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ },
+ { title: "Add", field: "updatedDate", editable: 'never',
+ cellStyle: cellStyle,
+ headerStyle: headerStyle
+ }
+ ],
+ tableIcons: {
+ FirstPage: forwardRef((props, ref) => <FirstPage {...props} ref={ref} />),
+ LastPage: forwardRef((props, ref) => <LastPage {...props} ref={ref} />),
+ NextPage: forwardRef((props, ref) => <ChevronRight {...props} ref={ref} />),
+ PreviousPage: forwardRef((props, ref) => <ChevronLeft {...props} ref={ref} />),
+ ResetSearch: forwardRef((props, ref) => <Clear {...props} ref={ref} />),
+ Search: forwardRef((props, ref) => <Search {...props} ref={ref} />),
+ SortArrow: forwardRef((props, ref) => <ArrowUpward {...props} ref={ref} />)
+ }
+ };
+
+ constructor(props, context) {
+ super(props, context);
+ this.handleClose = this.handleClose.bind(this);
+ this.getPolicyToscaModels = this.getToscaPolicyModels.bind(this);
+ this.handleYamlContent = this.handleYamlContent.bind(this);
+ this.getToscaPolicyModelYaml = this.getToscaPolicyModelYaml.bind(this);
+ this.handleAdd = this.handleAdd.bind(this);
+ this.getToscaPolicyModels();
+ }
+
+ componentWillReceiveProps(newProps) {
+ this.setState({
+ loopCache: newProps.loopCache,
+ temporaryPropertiesJson: JSON.parse(JSON.stringify(newProps.loopCache.getGlobalProperties()))
+ });
+ }
+
+ getToscaPolicyModels() {
+ PolicyToscaService.getToscaPolicyModels().then(allToscaModels => {
+ this.setState({ toscaPolicyModelsData: allToscaModels});
+ });
+ }
+
+ getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
+ if (typeof policyModelType !== "undefined") {
+ PolicyToscaService.getToscaPolicyModelYaml(policyModelType, policyModelVersion).then(toscaYaml => {
+ if (toscaYaml.length !== 0) {
+ this.setState({content: toscaYaml})
+ } else {
+ this.setState({ content: 'No Tosca model Yaml available' })
+ }
+ });
+ } else {
+ this.setState({ content: 'Please select Tosca model to view the details' })
+ }
+ }
+
+ handleYamlContent(event) {
+ this.setState({ content: event.target.value });
+ }
+
+ handleClose() {
+ this.setState({ show: false });
+ this.props.history.push('/');
+ }
+
+ handleAdd() {
+ LoopService.addOperationalPolicyType(this.state.loopCache.getLoopName(),this.state.selectedRowData.policyModelType,this.state.selectedRowData.version);
+ this.handleClose();
+ this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+ }
+
+ render() {
+ return (
+ <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose}>
+ <Modal.Header closeButton>
+ </Modal.Header>
+ <Modal.Body>
+ <MaterialTable
+ title={"View Tosca Policy Models"}
+ data={this.state.toscaPolicyModelsData}
+ columns={this.state.toscaColumns}
+ icons={this.state.tableIcons}
+ onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType, rowData.version);this.setState({selectedRowData: rowData})}}
+ options={{
+ headerStyle: rowHeaderStyle,
+ rowStyle: rowData => ({
+ backgroundColor: (this.state.selectedRowData !== {} && this.state.selectedRowData.id === rowData.tableData.id) ? '#EEE' : '#FFF'
+ })
+ }}
+ />
+ <div>
+ <TextModal value={this.state.content} onChange={this.handleYamlContent}/>
+ </div>
+ </Modal.Body>
+ <Modal.Footer>
+ <Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>
+ <Button variant="primary" type="submit" onClick={this.handleAdd}>Add</Button>
+ </Modal.Footer>
+ </ModalStyled>
+ );
+ }
+}
diff --git a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
index fbfc727eb..4e8d97820 100644
--- a/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
+++ b/ui-react/src/components/dialogs/Loop/OpenLoopModal.js
@@ -68,15 +68,16 @@ export default class OpenLoopModal extends React.Component {
getLoopNames() {
LoopService.getLoopNames().then(loopNames => {
- const loopOptions = loopNames.map((loopName) => { return { label: loopName, value: loopName } });
- this.setState({ loopNames: loopOptions })
+ if (Object.entries(loopNames).length !== 0) {
+ const loopOptions = loopNames.filter(loopName => loopName!=='undefined').map((loopName) => { return { label: loopName, value: loopName } });
+ this.setState({ loopNames: loopOptions })
+ }
});
}
handleOpen() {
console.info("Loop " + this.state.chosenLoopName + " is chosen");
- this.setState({ show: false });
- this.props.history.push('/');
+ this.handleClose();
this.props.loadLoopFunction(this.state.chosenLoopName);
}
diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
index 76beca711..2e0460f61 100644
--- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js
@@ -28,7 +28,7 @@ import Row from 'react-bootstrap/Row';
import Col from 'react-bootstrap/Col';
import styled from 'styled-components';
import Alert from 'react-bootstrap/Alert';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import PolicyToscaService from '../../../api/PolicyToscaService';
const ModalStyled = styled(Modal)`
background-color: transparent;
@@ -37,7 +37,7 @@ export default class UploadToscaPolicyModal extends React.Component {
constructor(props, context) {
super(props, context);
- this.handleUploadToscaPolicyModel = this.handleUploadToscaPolicyModel.bind(this);
+ this.handleCreateFromToscaPolicyModel = this.handleCreateFromToscaPolicyModel.bind(this);
this.handleClose = this.handleClose.bind(this);
this.handlePolicyModelType = this.handlePolicyModelType.bind(this);
this.fileSelectedHandler = this.fileSelectedHandler.bind(this);
@@ -55,16 +55,10 @@ export default class UploadToscaPolicyModal extends React.Component {
fileSelectedHandler = (event) => {
if (event.target.files && event.target.files[0]) {
const scope = this;
- let reader = new FileReader();
+ let reader = new FileReader();
this.setState({policyModelType: '', policyModelTosca: '' });
reader.onload = function(e) {
- var lines = reader.result.split('\n');
- for (var line = 0; line < lines.length; line++) {
- if(lines[line].trim().slice(0, 24) === 'onap.policies.monitoring') {
- var microsvc = lines[line].trim().slice(0, -1);
- scope.setState({ policyModelType: microsvc, policyModelTosca: reader.result});
- }
- }
+ scope.setState({ policyModelTosca: reader.result});
};
console.log("Filename is", event.target.files[0]);
reader.readAsText(event.target.files[0]);
@@ -77,11 +71,11 @@ export default class UploadToscaPolicyModal extends React.Component {
this.props.history.push('/');
}
- handleUploadToscaPolicyModel(e) {
- e.preventDefault();
+ handleCreateFromToscaPolicyModel(e) {
+ e.preventDefault();
console.log("Policy Model Type is", this.state.policyModelType);
if(this.state.policyModelType && this.state.policyModelTosca) {
- TemplateMenuService.uploadToscaPolicyModal(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
+ PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelType, this.state.policyModelTosca).then(resp => {
if(resp.status === 200) {
this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true});
} else {
@@ -103,7 +97,7 @@ export default class UploadToscaPolicyModal extends React.Component {
return (
<ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
<Modal.Header closeButton>
- <Modal.Title>Upload Tosca Modal</Modal.Title>
+ <Modal.Title>Upload Tosca Model</Modal.Title>
</Modal.Header>
<Modal.Body>
<Form.Group as={Row} controlId="formPlaintextEmail">
@@ -114,7 +108,7 @@ export default class UploadToscaPolicyModal extends React.Component {
<Alert variant="secondary">
<p>{this.state.selectedFile.name}</p>
</Alert>
- <Form.Label column sm="2">Micro Service Name:</Form.Label>
+ <Form.Label column sm="2">Policy Model Type:</Form.Label>
<input type="text" style={{width: '50%'}}
value={this.state.policyModelType}
onChange={this.handlePolicyModelType}
@@ -124,7 +118,7 @@ export default class UploadToscaPolicyModal extends React.Component {
</Modal.Body>
<Modal.Footer>
{!this.state.apiResponseStatus?<Button variant="secondary" type="null" onClick={this.handleClose}>Cancel</Button>:""}
- {!this.state.apiResponseStatus?<Button disabled={!this.state.selectedFile.name || this.state.upldBtnClicked} variant="primary" type="submit" onClick={this.handleUploadToscaPolicyModel.bind(this)}>Upload</Button>:""}
+ {!this.state.apiResponseStatus?<Button disabled={!this.state.selectedFile.name || this.state.upldBtnClicked} variant="primary" type="submit" onClick={this.handleCreateFromToscaPolicyModel.bind(this)}>Create</Button>:""}
{this.state.apiResponseStatus?<Alert variant={this.state.apiResponseStatus === 200?"success":"danger"}>
<p>{this.state.apiResponseMessage}</p>
<Button onClick={this.handleClose} variant={this.state.apiResponseStatus === 200?"outline-success":"danger"}>
diff --git a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
index a78d454ff..89e5697c9 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewLoopTemplatesModal.js
@@ -25,7 +25,7 @@ import React, { forwardRef } from 'react'
import Button from 'react-bootstrap/Button';
import Modal from 'react-bootstrap/Modal';
import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import TemplateService from '../../../api/TemplateService';
import ArrowUpward from '@material-ui/icons/ArrowUpward';
import ChevronLeft from '@material-ui/icons/ChevronLeft';
import ChevronRight from '@material-ui/icons/ChevronRight';
@@ -103,7 +103,7 @@ export default class ViewLoopTemplatesModal extends React.Component {
}
getBlueprintMicroServiceTemplates() {
- TemplateMenuService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
+ TemplateService.getBlueprintMicroServiceTemplates().then(loopTemplateData => {
this.setState({ loopTemplateData: loopTemplateData })
});
}
diff --git a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
index 5b66a25c0..650080520 100644
--- a/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
+++ b/ui-react/src/components/dialogs/Tosca/ViewToscaPolicyModal.js
@@ -26,7 +26,7 @@ import MaterialTable from "material-table";
import Button from 'react-bootstrap/Button';
import Modal from 'react-bootstrap/Modal';
import styled from 'styled-components';
-import TemplateMenuService from '../../../api/TemplateMenuService';
+import PolicyToscaService from '../../../api/PolicyToscaService';
import ArrowUpward from '@material-ui/icons/ArrowUpward';
import ChevronLeft from '@material-ui/icons/ChevronLeft';
import ChevronRight from '@material-ui/icons/ChevronRight';
@@ -109,14 +109,14 @@ export default class ViewToscalPolicyModal extends React.Component {
}
getToscaPolicyModels() {
- TemplateMenuService.getToscaPolicyModels().then(toscaPolicyModelNames => {
+ PolicyToscaService.getToscaPolicyModels().then(toscaPolicyModelNames => {
this.setState({ toscaPolicyModelNames: toscaPolicyModelNames });
});
}
- getToscaPolicyModelYaml(policyModelType) {
+ getToscaPolicyModelYaml(policyModelType, policyModelVersion) {
if (typeof policyModelType !== "undefined") {
- TemplateMenuService.getToscaPolicyModelYaml(policyModelType).then(toscaYaml => {
+ PolicyToscaService.getToscaPolicyModelYaml(policyModelType, policyModelVersion).then(toscaYaml => {
if (toscaYaml.length !== 0) {
this.setState({content: toscaYaml})
} else {
@@ -148,7 +148,7 @@ export default class ViewToscalPolicyModal extends React.Component {
data={this.state.toscaPolicyModelNames}
columns={this.state.toscaColumns}
icons={this.state.tableIcons}
- onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType);this.setState({selectedRow: rowData.tableData.id})}}
+ onRowClick={(event, rowData) => {this.getToscaPolicyModelYaml(rowData.policyModelType,rowData.version);this.setState({selectedRow: rowData.tableData.id})}}
options={{
headerStyle: rowHeaderStyle,
rowStyle: rowData => ({
diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
index 1b5cd82a8..8e801367b 100644
--- a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
+++ b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap
@@ -11,7 +11,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
closeLabel="Close"
>
<ModalTitle>
- Upload Tosca Modal
+ Upload Tosca Model
</ModalTitle>
</ModalHeader>
<ModalBody>
@@ -72,7 +72,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
sm="2"
srOnly={false}
>
- Micro Service Name:
+ Policy Model Type:
</FormLabel>
<input
onChange={[Function]}
@@ -104,7 +104,7 @@ exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = `
type="submit"
variant="primary"
>
- Upload
+ Create
</Button>
</ModalFooter>
</Styled(Bootstrap(Modal))>
diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js
index 98c7bffcf..c1a7ac3bb 100644
--- a/ui-react/src/components/menu/MenuBar.js
+++ b/ui-react/src/components/menu/MenuBar.js
@@ -87,27 +87,28 @@ export default class MenuBar extends React.Component {
return (
<Navbar.Collapse>
- <StyledNavDropdown title="Template">
- <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Policy Model</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Policy Models</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View Loop Templates</NavDropdown.Item>
+ <StyledNavDropdown title="Loop Templates">
+ <NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View All Templates</NavDropdown.Item>
</StyledNavDropdown>
- <StyledNavDropdown title="Closed Loop">
- <NavDropdown.Item as={StyledLink} to="/openLoop">Open CL</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties CL</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close Model</NavDropdown.Item>
- </StyledNavDropdown>
- <StyledNavDropdown title="Manage">
- <NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Submit</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Stop</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>Restart</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy</NavDropdown.Item>
- <NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy</NavDropdown.Item>
- </StyledNavDropdown>
- <StyledNavDropdown title="View">
+ <StyledNavDropdown title="Policy Models">
+ <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item>
+ </StyledNavDropdown>
+ <StyledNavDropdown title="Loop Instance">
+ <NavDropdown.Item as={StyledLink} to="/openLoop">Open Loop</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/modifyLoop" >Modify</NavDropdown.Item>
<NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item>
</StyledNavDropdown>
+ <StyledNavDropdown title="Loop Operations">
+ <NavDropdown.Item as={StyledLink} to="/submit" disabled={this.state.disabled}>Create and deploy to Policy Engine(SUBMIT)</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Undeploy from Policy Engine (STOP)</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>ReDeploy to Policy Engine (RESTART)</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete loop instance (DELETE)</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy to DCAE (DEPLOY)</NavDropdown.Item>
+ <NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy to DCAE (UNDEPLOY)</NavDropdown.Item>
+ </StyledNavDropdown>
<StyledNavDropdown title="Help">
<StyledNavLink href="https://wiki.onap.org/" target="_blank">Wiki</StyledNavLink>
<StyledNavLink href="mailto:onap-discuss@lists.onap.org?subject=CLAMP&body=Please send us suggestions or feature enhancements or defect. If possible, please send us the steps to replicate any defect.">Contact Us</StyledNavLink>
diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
index 14030f012..a7e66eddd 100644
--- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
+++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap
@@ -3,7 +3,7 @@
exports[`Verify MenuBar Test the render method 1`] = `
<NavbarCollapse>
<Styled(NavDropdown)
- title="Template"
+ title="Loop Templates"
>
<DropdownItem
as={
@@ -52,10 +52,14 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={false}
- to="/uploadToscaPolicyModal"
+ to="/ViewLoopTemplatesModal"
>
- Upload Tosca Policy Model
+ View All Templates
</DropdownItem>
+ </Styled(NavDropdown)>
+ <Styled(NavDropdown)
+ title="Policy Models"
+ >
<DropdownItem
as={
Object {
@@ -103,9 +107,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={false}
- to="/viewToscaPolicyModal"
+ to="/uploadToscaPolicyModal"
>
- View Tosca Policy Models
+ Upload Tosca Model
</DropdownItem>
<DropdownItem
as={
@@ -154,13 +158,13 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={false}
- to="/ViewLoopTemplatesModal"
+ to="/viewToscaPolicyModal"
>
- View Loop Templates
+ View Tosca Models
</DropdownItem>
</Styled(NavDropdown)>
<Styled(NavDropdown)
- title="Closed Loop"
+ title="Loop Instance"
>
<DropdownItem
as={
@@ -211,7 +215,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
disabled={false}
to="/openLoop"
>
- Open CL
+ Open Loop
</DropdownItem>
<DropdownItem
as={
@@ -262,7 +266,7 @@ exports[`Verify MenuBar Test the render method 1`] = `
disabled={true}
to="/loopProperties"
>
- Properties CL
+ Properties
</DropdownItem>
<DropdownItem
as={
@@ -313,12 +317,59 @@ exports[`Verify MenuBar Test the render method 1`] = `
disabled={true}
to="/closeLoop"
>
- Close Model
+ Close
+ </DropdownItem>
+ <DropdownItem
+ as={
+ Object {
+ "$$typeof": Symbol(react.forward_ref),
+ "attrs": Array [],
+ "componentStyle": ComponentStyle {
+ "componentId": "sc-bdVaJa",
+ "isStatic": false,
+ "rules": Array [
+ "
+ color: ",
+ [Function],
+ ";
+ background-color: ",
+ [Function],
+ ";
+ font-weight: normal;
+ display: block;
+ width: 100%;
+ padding: .25rem 1.5rem;
+ clear: both;
+ text-align: inherit;
+ white-space: nowrap;
+ border: 0;
+ :hover {
+ text-decoration: none;
+ background-color: ",
+ [Function],
+ ";
+ color: ",
+ [Function],
+ ";
+ }
+",
+ ],
+ },
+ "displayName": "Styled(Link)",
+ "foldedComponentIds": Array [],
+ "render": [Function],
+ "styledComponentId": "sc-bdVaJa",
+ "target": [Function],
+ "toString": [Function],
+ "warnTooManyClasses": [Function],
+ "withComponent": [Function],
+ }
+ }
+ disabled={false}
+ to="/modifyLoop"
+ >
+ Modify
</DropdownItem>
- </Styled(NavDropdown)>
- <Styled(NavDropdown)
- title="Manage"
- >
<DropdownItem
as={
Object {
@@ -366,10 +417,14 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/submit"
+ to="/refreshStatus"
>
- Submit
+ Refresh Status
</DropdownItem>
+ </Styled(NavDropdown)>
+ <Styled(NavDropdown)
+ title="Loop Operations"
+ >
<DropdownItem
as={
Object {
@@ -417,9 +472,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/stop"
+ to="/submit"
>
- Stop
+ Create and deploy to Policy Engine(SUBMIT)
</DropdownItem>
<DropdownItem
as={
@@ -468,9 +523,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/restart"
+ to="/stop"
>
- Restart
+ Undeploy from Policy Engine (STOP)
</DropdownItem>
<DropdownItem
as={
@@ -519,9 +574,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/delete"
+ to="/restart"
>
- Delete
+ ReDeploy to Policy Engine (RESTART)
</DropdownItem>
<DropdownItem
as={
@@ -570,9 +625,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/deploy"
+ to="/delete"
>
- Deploy
+ Delete loop instance (DELETE)
</DropdownItem>
<DropdownItem
as={
@@ -621,14 +676,10 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/undeploy"
+ to="/deploy"
>
- UnDeploy
+ Deploy to DCAE (DEPLOY)
</DropdownItem>
- </Styled(NavDropdown)>
- <Styled(NavDropdown)
- title="View"
- >
<DropdownItem
as={
Object {
@@ -676,9 +727,9 @@ exports[`Verify MenuBar Test the render method 1`] = `
}
}
disabled={true}
- to="/refreshStatus"
+ to="/undeploy"
>
- Refresh Status
+ UnDeploy to DCAE (UNDEPLOY)
</DropdownItem>
</Styled(NavDropdown)>
<Styled(NavDropdown)