Updated sparky

Updated to Casablanca image and configuration

Issue-ID: AAI-1736
Change-Id: I5a2bd265ca7f6d496f06eb78e75597997fbecd04
Signed-off-by: fpaquett <francis.paquette@amdocs.com>

diff --git a/deploy_vm1.sh b/deploy_vm1.sh
index 4e55d62..2670d6e 100755 (executable)
--- a/deploy_vm1.sh
+++ b/deploy_vm1.sh
@@ -103,7 +103,7 @@ GRAPHADMIN_DOCKER_IMAGE_VERSION=1.0-STAGING-latest
 SEARCH_DATA_SERVICE_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 DATA_ROUTER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 MODEL_LOADER_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
-SPARKY_BE_DOCKER_IMAGE_VERSION=1.2.1
+SPARKY_BE_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 CHAMP_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 GIZMO_DOCKER_IMAGE_VERSION=1.3-STAGING-latest
 SPIKE_DOCKER_IMAGE_VERSION=1.0-STAGING-latest

diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index fd5c7b9..13bcac7 100644 (file)
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -160,14 +160,18 @@ services:
     hostname: sparky-be
     volumes:
       - ${UI_LOGS}:/logs
-      - /opt/test-config/sparky/appconfig:/opt/app/sparky/config
+      - /opt/test-config/sparky/appconfig/auth:/opt/app/sparky/config/auth
+      - /opt/test-config/sparky/appconfig/portal:/opt/app/sparky/config/portal
+      - /opt/test-config/sparky/appconfig/application.properties:/opt/app/sparky/config/application.properties
+      - /opt/test-config/sparky/appconfig/application-oxm-default.properties:/opt/app/sparky/config/application-oxm-default.properties
+      - /opt/test-config/sparky/appconfig/application-oxm-schema-prod.properties:/opt/app/sparky/config/application-oxm-schema-prod.properties
+      - /opt/test-config/sparky/appconfig/application-resources.properties:/opt/app/sparky/config/application-resources.properties
+      - /opt/test-config/sparky/appconfig/application-ssl.properties:/opt/app/sparky/config/application-ssl.properties
+      - /opt/test-config/sparky/appconfig/users.config:/opt/app/sparky/config/users.config
+      - /opt/test-config/sparky/appconfig/roles.config:/opt/app/sparky/config/roles.config
+
     ports:
       - 9517:9517
-    environment:
-      - KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-      - KEYSTORE_ALIAS_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
-      - SPARKY_SSL_ENABLED=false
-      - SPARKY_PORTAL_ENABLED=true
     logging:
       driver: "json-file"
       options:

diff --git a/sparky/appconfig/application-camel.properties b/sparky/appconfig/application-camel.properties
deleted file mode 100644 (file)
index 9cd68cb..0000000
--- a/sparky/appconfig/application-camel.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-camel.springboot.name = SparkyCamelContext\r
-#camel.springboot.xmlRests = file:${CONFIG_HOME}/camel-rests/*.xml\r
-camel.component.servlet.mapping.context-path=/rest/*
\ No newline at end of file

diff --git a/sparky/appconfig/application-fe-prod.properties b/sparky/appconfig/application-fe-prod.properties
deleted file mode 100644 (file)
index 608c829..0000000
--- a/sparky/appconfig/application-fe-prod.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-\r
-server.servlet.context-path=/services/aai/webapp/\r
-\r
-#\r
-#  attempt to externalize ui JS classes + resources\r
-#\r
-spring.resources.static-locations=file:${APP_HOME}/static/
\ No newline at end of file

diff --git a/sparky/appconfig/application-http.properties b/sparky/appconfig/application-http.properties
deleted file mode 100644 (file)
index f81a597..0000000
--- a/sparky/appconfig/application-http.properties
+++ /dev/null
@@ -1 +0,0 @@
-server.port = 9517
\ No newline at end of file

diff --git a/sparky/appconfig/application-oxm-default.properties b/sparky/appconfig/application-oxm-default.properties
index afa0aaa..0f3b825 100644 (file)
--- a/sparky/appconfig/application-oxm-default.properties
+++ b/sparky/appconfig/application-oxm-default.properties
@@ -1,2 +1,16 @@
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
 oxm.apiVersion=v14
-oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14
\ No newline at end of file
+oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14

diff --git a/sparky/appconfig/application-oxm-override.properties b/sparky/appconfig/application-oxm-override.properties
index afa0aaa..0f3b825 100644 (file)
--- a/sparky/appconfig/application-oxm-override.properties
+++ b/sparky/appconfig/application-oxm-override.properties
@@ -1,2 +1,16 @@
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
 oxm.apiVersion=v14
-oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14
\ No newline at end of file
+oxm.apiVersionList=v8,v9,v10,v11,v12,v13,v14

diff --git a/sparky/appconfig/application-oxm-schema-prod.properties b/sparky/appconfig/application-oxm-schema-prod.properties
index 24db5ef..2f5b30c 100644 (file)
--- a/sparky/appconfig/application-oxm-schema-prod.properties
+++ b/sparky/appconfig/application-oxm-schema-prod.properties
@@ -1 +1,16 @@
-oxm.schemaNodeDir=/opt/app/sparky/onap/oxm
\ No newline at end of file
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
+oxm.schemaNodeDir=/opt/app/sparky/onap/oxm
+

diff --git a/sparky/appconfig/application-resources.properties b/sparky/appconfig/application-resources.properties
index 716a557..6b5fa19 100644 (file)
--- a/sparky/appconfig/application-resources.properties
+++ b/sparky/appconfig/application-resources.properties
@@ -1,3 +1,17 @@
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
 resources.hostname=aai.api.simpledemo.openecomp.org
 resources.port=8443
 resources.authType=SSL_BASIC

diff --git a/sparky/appconfig/application-ssl.properties b/sparky/appconfig/application-ssl.properties
index ba0a8db..1f98b6b 100644 (file)
--- a/sparky/appconfig/application-ssl.properties
+++ b/sparky/appconfig/application-ssl.properties
@@ -1,3 +1,17 @@
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
 server.port = 8000
 server.ssl.key-store=file:${CONFIG_HOME}/auth/tomcat_keystore
 server.ssl.key-store-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10

diff --git a/sparky/appconfig/application-sync.properties b/sparky/appconfig/application-sync.properties
index 836ab80..c3119a4 100644 (file)
--- a/sparky/appconfig/application-sync.properties
+++ b/sparky/appconfig/application-sync.properties
@@ -1,6 +1,21 @@
+# Copyright © 2018 Amdocs, AT&T\r
+#\r
+# Licensed under the Apache License, Version 2.0 (the "License");\r
+# you may not use this file except in compliance with the License.\r
+# You may obtain a copy of the License at\r
+#\r
+#       http://www.apache.org/licenses/LICENSE-2.0\r
+#\r
+# Unless required by applicable law or agreed to in writing, software\r
+# distributed under the License is distributed on an "AS IS" BASIS,\r
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+# See the License for the specific language governing permissions and\r
+# limitations under the License.\r
+\r
+\r
 aggregationSyncEnabled=true\r
 historicalEntitySyncEnabled=true\r
 autoSuggestSyncEnabled=true\r
 vnfAliasSyncEnabled=true\r
 geoSyncEnabled=true\r
-viewInspectSyncEnabled=true
\ No newline at end of file
+viewInspectSyncEnabled=true\r

diff --git a/sparky/appconfig/application.properties b/sparky/appconfig/application.properties
index a0af547..cd28d02 100644 (file)
--- a/sparky/appconfig/application.properties
+++ b/sparky/appconfig/application.properties
@@ -1,3 +1,18 @@
+# Copyright © 2018 Amdocs, AT&T
+#
+# 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.
+
+
 #
 # disable the default thyme leaf icon on web-pages
 #
@@ -8,13 +23,10 @@ spring.mvc.favicon.enabled=false
 # and in the values.yaml change the internalPort to 9517
 #
 
-spring.profiles.active=camel,http,fe-prod,oxm-schema-prod,oxm-default,resources,sync
-
-elasticsearch.hostname=aai.elasticsearch.simpledemo.openecomp.org
-elasticsearch.port=9200
+spring.profiles.active=camel,http,fe-prod,oxm-schema-prod,oxm-default,resources,sync,portal
 
 searchservice.hostname=aai.searchservice.simpledemo.openecomp.org
 searchservice.port=9509
 searchservice.client-cert=client-cert-onap.p12
-searchservice.client-cert-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
+searchservice.client-cert-password=1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10
 searchservice.truststore=tomcat_keystore

diff --git a/sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml b/sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml
deleted file mode 100644 (file)
index e4e02ba..0000000
--- a/sparky/appconfig/camel-rests/sparky-core-filter-aggregation.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-   <rest>
-      <post uri="/search/filterAggregation">
-         <to uri="bean:aggregateSummaryProcessor?method=getFilteredAggregation"/>
-      </post>
-   </rest>
-</rests>
\ No newline at end of file

diff --git a/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml b/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml
deleted file mode 100644 (file)
index 20dba6f..0000000
--- a/sparky/appconfig/camel-rests/sparky-core-prepareSchema.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-       <rest>
-               <post uri="/visualization/prepareVisualization">
-                       <route>
-                               <to uri="bean:schemaVisualizationProcessor?method=processVisualizationRequest" />
-                       </route>
-               </post>
-       </rest>
-</rests>
-
-         

diff --git a/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml b/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml
deleted file mode 100644 (file)
index f6a2953..0000000
--- a/sparky/appconfig/camel-rests/sparky-core-subscriptionService.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-   <rest>
-      <get uri="/subscription/getsubscription">
-         <to uri="bean:subscriptionServiceProcessor?method=getSubscription"/>
-      </get>
-   </rest>
-</rests>
\ No newline at end of file

diff --git a/sparky/appconfig/camel-rests/sparky-core-unified-search.xml b/sparky/appconfig/camel-rests/sparky-core-unified-search.xml
deleted file mode 100644 (file)
index 61fd9ad..0000000
--- a/sparky/appconfig/camel-rests/sparky-core-unified-search.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-   <rest>
-      <post uri="/search/querysearch">
-         <to uri="bean:unifiedSearchProcessor?method=search"/>
-      </post>
-   </rest>
-</rests>
\ No newline at end of file

diff --git a/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml b/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml
deleted file mode 100644 (file)
index 1b975e9..0000000
--- a/sparky/appconfig/camel-rests/sparky-core-unifiedFilterRequest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<rests xmlns="http://camel.apache.org/schema/spring">
-   <rest>
-      <post uri="/search/unifiedFilterRequest">
-         <to uri="bean:filterProcessor?method=getFiltersWithValues"/>
-      </post>
-   </rest>
-</rests>
\ No newline at end of file

diff --git a/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json b/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json
deleted file mode 100644 (file)
index e72bab0..0000000
--- a/sparky/appconfig/descriptors/aaiEntityNodeDescriptors.json
+++ /dev/null
@@ -1,218 +0,0 @@
-{
-       "generalNodeClass": {
-               "class": "aai-entity-node general-node",
-               "visualElements": [{
-                       "type": "circle",
-                       "class": "outer",
-                       "svgAttributes": {
-                               "r": "16"
-                       }
-               },
-               {
-                       "type": "circle",
-                       "class": "inner",
-                       "svgAttributes": {
-                               "r": "10"
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-type-label",
-                       "displayKey": "itemType",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "33"
-                               }
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-value-label",
-                       "displayKey": "itemNameValue",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "48"
-                               }
-                       }
-               }]
-       },
-       "searchedNodeClass": {
-               "class": "aai-entity-node search-node",
-               "visualElements": [{
-                       "type": "circle",
-                       "class": "outer",
-                       "svgAttributes": {
-                               "r": "16"
-                       }
-               },
-               {
-                       "type": "circle",
-                       "class": "inner",
-                       "svgAttributes": {
-                               "r": "10"
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-type-label",
-                       "displayKey": "itemType",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "33"
-                               }
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-value-label",
-                       "displayKey": "itemNameValue",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "48"
-                               }
-                       }
-               }]
-       },
-       "selectedSearchedNodeClass": {
-               "class": "aai-entity-node selected-search-node",
-               "visualElements": [{
-                       "type": "circle",
-                       "class": "outer",
-                       "svgAttributes": {
-                               "r": "31"
-                       }
-               },
-               {
-                       "type": "circle",
-                       "class": "inner",
-                       "svgAttributes": {
-                               "r": "20"
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-type-label",
-                       "displayKey": "itemType",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "48"
-                               }
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-value-label",
-                       "displayKey": "itemNameValue",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "63"
-                               }
-                       }
-               },
-               {
-                       "type": "button",
-                       "name": "icon_ellipses",
-                       "class": "node-button",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "33",
-                                       "y": "-35"
-                               }
-                       },
-                       "svgAttributes": {
-                               "className": "node-button",
-                               "r": "10"
-                       }
-               },
-               {
-                       "type": "button",
-                       "name": "icon_triangle_warning",
-                       "class": "node-button",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "46",
-                                       "y": "-12"
-                               }
-                       },
-                       "svgAttributes": {
-                               "className": "node-button",
-                               "r": "10"
-                       }
-               }]
-       },
-       "selectedNodeClass": {
-               "class": "aai-entity-node selected-node",
-               "visualElements": [{
-                       "type": "circle",
-                       "class": "outer",
-                       "svgAttributes": {
-                               "r": "31"
-                       }
-               },
-               {
-                       "type": "circle",
-                       "class": "inner",
-                       "svgAttributes": {
-                               "r": "20"
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-type-label",
-                       "displayKey": "itemType",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "48"
-                               }
-                       }
-               },
-               {
-                       "type": "text",
-                       "class": "id-value-label",
-                       "displayKey": "itemNameValue",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "0",
-                                       "y": "63"
-                               }
-                       }
-               },
-               {
-                       "type": "button",
-                       "name": "icon_ellipses",
-                       "class": "node-button",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "33",
-                                       "y": "-35"
-                               }
-                       },
-                       "svgAttributes": {
-                               "className": "node-button",
-                               "r": "10"
-                       }
-               },
-               {
-                       "type": "button",
-                       "name": "icon_triangle_warning",
-                       "class": "node-button",
-                       "shapeAttributes": {
-                               "offset": {
-                                       "x": "46",
-                                       "y": "-12"
-                               }
-                       },
-                       "svgAttributes": {
-                               "className": "node-button",
-                               "r": "10"
-                       }
-               }]
-       }
-}
\ No newline at end of file

diff --git a/sparky/appconfig/filters/aaiui_filters.json b/sparky/appconfig/filters/aaiui_filters.json
deleted file mode 100644 (file)
index 62b6811..0000000
--- a/sparky/appconfig/filters/aaiui_filters.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-       "filters": [
-       {
-               "filterId": "1",
-               "filterName": "Orchestration-Status",
-               "displayName": "Orchestration Status",
-               "dataType": "dropDown",
-        "multiSelect": "false",
-        "watermark": "Any Orchestration Status",
-        "optionsType": "options",
-               "dataSource": {
-                       "indexName": "aggregate_generic-vnf_index",
-                       "docType": "default",
-                       "fieldName": "orchestration-status"
-               }
-       },
-       {
-               "filterId": "2",
-               "filterName": "Prov-Status",
-               "displayName": "Provisioning Status",
-               "dataType": "dropDown",
-        "multiSelect": "false",
-        "watermark": "Any Provisioning Status",
-        "optionsType": "options",
-               "dataSource": {
-                       "indexName": "aggregate_generic-vnf_index",
-                       "docType": "default",
-                       "fieldName": "prov-status"
-               }
-       },
-       {
-               "filterId": "5",
-               "filterName": "Date",
-               "displayName": "Date",
-               "dataType": "date",
-        "multiSelect": "false",
-        "watermark": "Choose Date Range",
-        "defaultValue" : {"decode": "Today", "code": "last_0_hours"},
-        "optionsType": "dynamicOptions",
-        "optionsValues": [
-               {"decode": "Today", "code": "last_0_hours"},
-               {"decode": "Since Yesterday", "code": "last_1_days"},
-               {"decode": "Since Last Week", "code": "last_1_weeks"},
-               {"decode": "Since Last Month", "code": "last_1_months"},
-               {"decode": "Since Last Year", "code": "last_1_years"},
-               {"decode": "Custom Range", "code": "custom_range"}
-        ]
-       },
-    {
-        "filterId": "7",
-               "filterName": "NF-Type",
-               "displayName": "Network Function Type",
-               "dataType": "dropDown",
-        "multiSelect": "false",
-        "watermark": "Any Network Function Type",
-        "optionsType": "options",
-               "dataSource": {
-                       "indexName": "aggregate_generic-vnf_index",
-                       "docType": "default",
-                       "fieldName": "nf-type"
-               }    
-       },
-    {
-        "filterId": "8",
-               "filterName": "NF-Role",
-               "displayName": "Network Function Role",
-               "dataType": "dropDown",
-        "multiSelect": "false",
-        "watermark": "Any Network Function Role",
-        "optionsType": "options",
-               "dataSource": {
-                       "indexName": "aggregate_generic-vnf_index",
-                       "docType": "default",
-                       "fieldName": "nf-role"
-               }    
-       }       
-       
-  ]
-}
\ No newline at end of file

diff --git a/sparky/appconfig/filters/aaiui_views.json b/sparky/appconfig/filters/aaiui_views.json
deleted file mode 100644 (file)
index 9ca0119..0000000
--- a/sparky/appconfig/filters/aaiui_views.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "views": [
-    {
-        "viewName" : "vnfSearch",
-        "filters" : [
-          {
-             "filterId": "1"
-          },
-          {
-             "filterId": "2"
-          },
-          {
-             "filterId": "7"
-          },
-          {
-             "filterId": "8"
-          }
-         ]
-    }
-   ]
-}
\ No newline at end of file

diff --git a/sparky/appconfig/filters/subscription_object_inspector_mapping.json b/sparky/appconfig/filters/subscription_object_inspector_mapping.json
deleted file mode 100644 (file)
index ad2ab7a..0000000
--- a/sparky/appconfig/filters/subscription_object_inspector_mapping.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "target": "",
-    "origin": "",
-    "messageType": "",
-    "topic": "",
-    "message": {
-        "applicationName": "",
-        "payload": {
-            "action": "",
-            "params": {
-                "objectName": "",
-                "externalClassId": ""
-            }
-        }
-    }
-}

diff --git a/sparky/appconfig/portal/roles.config b/sparky/appconfig/roles.config
similarity index 86%
rename from sparky/appconfig/portal/roles.config
rename to sparky/appconfig/roles.config
index 4d5d43e..b7894d8 100644 (file)
--- a/sparky/appconfig/portal/roles.config
+++ b/sparky/appconfig/roles.config
@@ -1,6 +1,6 @@
-[\r
-  {\r
-    "id":1,\r
-    "name":"View"\r
-  }\r
-]
\ No newline at end of file
+[
+  {
+    "id":1,
+    "name":"View"
+  }
+]