summaryrefslogtreecommitdiffstats
path: root/catalog-ui/configurations
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-03-04 14:53:33 +0200
committerMichael Lando <ml636r@att.com>2018-03-07 13:19:05 +0000
commita5445100050e49e83f73424198d73cd72d672a4d (patch)
treecacf4df817df31be23e4e790d1dda857bdae061e /catalog-ui/configurations
parent51157f92c21976cba4914c378aaa3cba49826931 (diff)
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-ui/configurations')
-rw-r--r--catalog-ui/configurations/dev.js10
-rw-r--r--catalog-ui/configurations/menu.js14
-rw-r--r--catalog-ui/configurations/prod.js9
3 files changed, 24 insertions, 9 deletions
diff --git a/catalog-ui/configurations/dev.js b/catalog-ui/configurations/dev.js
index 65d62c83e0..e15dae6b94 100644
--- a/catalog-ui/configurations/dev.js
+++ b/catalog-ui/configurations/dev.js
@@ -47,7 +47,6 @@ const SDC_CONFIG = {
"GET_lifecycle_state_CERTIFICATIONREQUEST":"lifecycleState/CERTIFICATIONREQUEST",
"GET_lifecycle_state_UNDOCHECKOUT":"lifecycleState/UNDOCHECKOUT",
"root": "/sdc1/feProxy/rest",
- "no_proxy_root": "/sdc1/rest",
"PUT_service": "/v1/catalog/services/:id/metadata",
"GET_download_artifact": "/v1/catalog/",
"GET_SDC_Version": "/version",
@@ -59,11 +58,14 @@ const SDC_CONFIG = {
"GET_resource_artifact_types": "/v1/artifactTypes",
"GET_onboarding": "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/packages",
"GET_component_from_csar_uuid": "/v1/catalog/resources/csar/:csar_uuid",
- "kibana": "/sdc1/kibanaProxy/"
+ "kibana": "/sdc1/kibanaProxy/",
+ "services_api_root": "/v1/catalog/services/",
+ "create_policy_instance":"/v1/catalog/:entityType/:entityId/policies/:policyId",
+ "CRUD_policy":"/v1/catalog/:entityType/policies/:policyId",
},
"resourceTypesFilter":{
- "resource":["CP","VFC","VL"],
- "service":["CP","VF","VL", "PNF","CVFC","SERVICE", "Configuration"]
+ "resource":["CP","VFC","VL","CVFC","GROUP","POLICY"],
+ "service":["CP","VF","VL", "PNF","CR","CVFC","SERVICE","Configuration","GROUP","POLICY"]
},
"logConfig": {
"minLogLevel": "debug",
diff --git a/catalog-ui/configurations/menu.js b/catalog-ui/configurations/menu.js
index 36f9d8076a..9bcf89c0c1 100644
--- a/catalog-ui/configurations/menu.js
+++ b/catalog-ui/configurations/menu.js
@@ -203,8 +203,9 @@ const SDC_MENU_CONFIG = {
"alertMessages": {
"lifecycleState/UNDOCHECKOUT": {"title": "Delete Version Confirmation", "message": "Are you sure you want to delete this version?"},
"exitWithoutSaving": {"title": "Exit Without Saving Confirmation", "message": "All unsaved changes will be lost. Are you sure you want to exit this page?"},
- "deleteInstance": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1 ?"},
- "deleteInput": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1 ?"}
+ "upgradeInstance": {"title": "Switch Versions", "message": "Switching versions will erase service paths: %1. Are you sure you want to proceed?"},
+ "deleteInstance": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"},
+ "deleteInput": {"title": "Delete Confirmation", "message": "Are you sure you would like to delete %1?"}
},
"statuses": {
"inDesign": {
@@ -346,6 +347,15 @@ const SDC_MENU_CONFIG = {
{"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
{"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
],
+ "CR":[
+ {"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
+ {"text":"Deployment Artifact", "action":"onMenuItemPressed", "state": "workspace.deployment_artifacts"},
+ {"text":"Information Artifact", "action":"onMenuItemPressed", "state": "workspace.information_artifacts"},
+ {"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
+ {"text":"Composition", "action":"onMenuItemPressed", "state": "workspace.composition.details"},
+ {"text":"Activity Log", "action":"onMenuItemPressed", "state": "workspace.activity_log"},
+ {"text":"Properties Assignment", "action":"onMenuItemPressed", "state": "workspace.properties_assignment"}
+ ],
"SERVICE":[
{"text":"General", "action":"onMenuItemPressed", "state": "workspace.general"},
{"text":"TOSCA Artifacts", "action":"onMenuItemPressed", "state": "workspace.tosca_artifacts"},
diff --git a/catalog-ui/configurations/prod.js b/catalog-ui/configurations/prod.js
index f08bfa3497..adbd650378 100644
--- a/catalog-ui/configurations/prod.js
+++ b/catalog-ui/configurations/prod.js
@@ -59,11 +59,14 @@ const SDC_CONFIG = {
"GET_resource_artifact_types": "/v1/artifactTypes",
"GET_onboarding": "/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/packages",
"GET_component_from_csar_uuid": "/v1/catalog/resources/csar/:csar_uuid",
- "kibana": "/sdc1/kibanaProxy/"
+ "kibana": "/sdc1/kibanaProxy/",
+ "services_api_root": "/v1/catalog/services/",
+ "create_policy_instance":"/v1/catalog/:entityType/:entityId/policies/:policyId",
+ "CRUD_policy":"/v1/catalog/:entityType/policies/:policyId",
},
"resourceTypesFilter":{
- "resource":["CP","VFC","VL"],
- "service":["CP","VF","VL", "PNF","CVFC","SERVICE","Configuration"]
+ "resource":["CP","VFC","VL","CVFC","GROUP","POLICY"],
+ "service":["CP","VF","VL", "PNF","CR","CVFC","SERVICE","Configuration","GROUP","POLICY"]
},
"logConfig": {
"minLogLevel": "debug",