CORD-2648 eliminate unnecessary core fixtures
Change-Id: I7ca5b6fbd6100ca1dd6c22ac644872a9801c6980
diff --git a/roles/cord-profile/files/fixtures.yaml b/roles/cord-profile/files/fixtures.yaml
index 4dcda54..e4f863f 100644
--- a/roles/cord-profile/files/fixtures.yaml
+++ b/roles/cord-profile/files/fixtures.yaml
@@ -19,22 +19,15 @@
description: Some basic fixtures
imports:
- - custom_types/deploymentrole.yaml
- custom_types/flavor.yaml
- custom_types/siterole.yaml
- custom_types/slicerole.yaml
- custom_types/networkparametertype.yaml
- custom_types/networktemplate.yaml
- - custom_types/xos.yaml
topology_template:
node_templates:
- xos:
- type: tosca.nodes.XOS
- properties:
- name: xos
-
# -----------------------------------------------------------------------------
# Network Parameter Types
# -----------------------------------------------------------------------------
@@ -87,11 +80,6 @@
properties:
role: tech
- deploymentrole#admin:
- type: tosca.nodes.DeploymentRole
- properties:
- role: admin
-
slicerole#admin:
type: tosca.nodes.SliceRole
properties:
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index da5dd44..c916886 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -119,7 +119,6 @@
- xos_config_synchronizer.yaml
- initial_data.yaml
- deployment.yaml
- - xos.yaml
- gateway-config.yml
- style.config.js
- app.config.js
diff --git a/roles/cord-profile/templates/template-service.yaml.j2 b/roles/cord-profile/templates/template-service.yaml.j2
index 4c05f59..df38901 100644
--- a/roles/cord-profile/templates/template-service.yaml.j2
+++ b/roles/cord-profile/templates/template-service.yaml.j2
@@ -21,7 +21,6 @@
description: TOSCA example of adding a service and service instance
imports:
- - custom_types/xos.yaml
- custom_types/slice.yaml
- custom_types/site.yaml
- custom_types/image.yaml
diff --git a/roles/cord-profile/templates/xos.yaml.j2 b/roles/cord-profile/templates/xos.yaml.j2
deleted file mode 100644
index 2613830..0000000
--- a/roles/cord-profile/templates/xos.yaml.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-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.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard XOS
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
- xos:
- type: tosca.nodes.XOS
diff --git a/roles/exampleservice-config/templates/test-exampleservice.yaml.j2 b/roles/exampleservice-config/templates/test-exampleservice.yaml.j2
index e2d3d48..9165e68 100644
--- a/roles/exampleservice-config/templates/test-exampleservice.yaml.j2
+++ b/roles/exampleservice-config/templates/test-exampleservice.yaml.j2
@@ -18,7 +18,6 @@
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
- - custom_types/xos.yaml
- custom_types/slice.yaml
- custom_types/site.yaml
- custom_types/image.yaml
diff --git a/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2 b/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2
deleted file mode 100644
index 029a7b4..0000000
--- a/roles/xos-gui-extension-build/templates/xos-gui-extensions.yml.j2
+++ /dev/null
@@ -1,35 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-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.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Persist xos-sample-gui-extension
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
- # UI Extension
-{% for ext in enabled_gui_extensions %}
- {{ext.name}}:
- type: tosca.nodes.XOSGuiExtension
- properties:
- files: /xos/extensions/{{ext.name}}/vendor.js, /xos/extensions/{{ext.name}}/app.js {% if ext.extra_files is defined %}{% for file in ext.extra_files%}, /xos/extensions/{{ext.name}}/{{file}} {% endfor %}{% endif %}
-{% endfor %}