[CORD-1959]
Adding CarrierEthernetApplication to ecord-global, ecord, mock-ecord-global, mock-ecord
Change-Id: I8d78d2364a779ebf637f0f94471d9d5f2a451e3a
diff --git a/profile_manifests/ecord-global.yml b/profile_manifests/ecord-global.yml
index 39bad06..801c7d4 100644
--- a/profile_manifests/ecord-global.yml
+++ b/profile_manifests/ecord-global.yml
@@ -33,6 +33,8 @@
- fabric-service.yaml
- vnodglobal-service.yaml
- xos-gui-extensions.yml
+ - carrierethernet-global-app.yaml
+
xos_other_templates:
- fabric-network-cfg.json
diff --git a/profile_manifests/ecord.yml b/profile_manifests/ecord.yml
index d793dfe..281736c 100644
--- a/profile_manifests/ecord.yml
+++ b/profile_manifests/ecord.yml
@@ -36,6 +36,7 @@
- public-net.yaml
- vee-service.yaml
- xos-gui-extensions.yml
+ - carrierethernet-local-app.yaml
xos_other_templates:
- fabric-network-cfg.json
diff --git a/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
new file mode 100644
index 0000000..073d797
--- /dev/null
+++ b/roles/cord-profile/templates/carrierethernet-global-app.yaml.j2
@@ -0,0 +1,24 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - custom_types/xos.yaml
+
+description: carrierethernet-app onboarding, generated by platform-install
+topology_template:
+ node_templates:
+
+ service#ONOS_CORD:
+ type: tosca.nodes.ONOSService
+ properties:
+ no-delete: true
+ no-create: true
+ no-update: true
+
+ CarrierEthernet_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - onos_tenant:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.TenantOfService
+ properties:
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0/ce-api-1.0.0.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-global-app/1.0.0/ecord-global-app-1.0.0.oar
diff --git a/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
new file mode 100644
index 0000000..14f28f5
--- /dev/null
+++ b/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
@@ -0,0 +1,42 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+imports:
+ - custom_types/xos.yaml
+
+description: carrierethernet-app onboarding, generated by platform-install
+topology_template:
+ node_templates:
+
+ service#ONOS_CORD:
+ type: tosca.nodes.ONOSService
+ properties:
+ no-delete: true
+ no-create: true
+ no-update: true
+
+ service#ONOS_Fabric:
+ type: tosca.nodes.ONOSService
+ properties:
+ no-delete: true
+ no-create: true
+ no-update: true
+
+ CarrierEthernet_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - onos_tenant:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.TenantOfService
+ properties:
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0/ce-api-1.0.0.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-local-app/1.0.0/ecord-local-app-1.0.0.oar, /repository/org/opencord/ce/vee/1.0.0/vee-1.0.0.oar
+ dependencies: org.onosproject.drivers.microsemi, org.onosproject.netconf
+
+
+ CarrierEthernet_Fabric_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - onos_tenant:
+ node: service#ONOS_Fabric
+ relationship: tosca.relationships.TenantOfService
+ properties:
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0/ce-api-1.0.0.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-local-app/1.0.0/ecord-local-app-1.0.0.oar, /repository/org/opencord/ce/co/1.0.0/co-1.0.0.oar
diff --git a/roles/cord-profile/templates/mock-onos.yaml.j2 b/roles/cord-profile/templates/mock-onos.yaml.j2
deleted file mode 100644
index 013d3bb..0000000
--- a/roles/cord-profile/templates/mock-onos.yaml.j2
+++ /dev/null
@@ -1,34 +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
-
-imports:
- - custom_types/xos.yaml
-
-description: enough onos config to make the mock work
-
-topology_template:
- node_templates:
-
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
-
- service#ONOS_CORD:
- type: tosca.nodes.ONOSService
-
diff --git a/roles/cord-profile/templates/vee-service.yaml.j2 b/roles/cord-profile/templates/vee-service.yaml.j2
index 9d7020e..7a113c4 100644
--- a/roles/cord-profile/templates/vee-service.yaml.j2
+++ b/roles/cord-profile/templates/vee-service.yaml.j2
@@ -77,11 +77,23 @@
type: tosca.nodes.ONOSApp
requirements:
- onos_tenant:
+ node: service#ONOS_CORD
+ relationship: tosca.relationships.TenantOfService
+ - vee_service:
+ node: service#vee
+ relationship: tosca.relationships.UsedByService
+ properties:
+ dependencies: org.onosproject.drivers, org.onosproject.ecord.carrierethernet, org.opencord.ce.local.vee
+
+ CarrierEthernet_Fabric_ONOS_app:
+ type: tosca.nodes.ONOSApp
+ requirements:
+ - onos_tenant:
node: service#ONOS_Fabric
relationship: tosca.relationships.TenantOfService
- vee_service:
node: service#vee
relationship: tosca.relationships.UsedByService
properties:
- dependencies: org.onosproject.drivers, org.onosproject.openflow-base, org.onosproject.ecord.carrierethernet
+ dependencies: org.onosproject.drivers, org.onosproject.ecord.carrierethernet, org.opencord.ce.local.co