Fixing to SNAPSHOT Version of CE app on local, fixing ONOS_CORD in vee-service.yaml
Change-Id: I29f4dbde9fb977c659f777ce9b1f03e18eec1318
(cherry picked from commit 8dec13e0fa70ee84d81cbc548a0a6e010a182297)
diff --git a/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2 b/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
index 14f28f5..191ae70 100644
--- a/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
+++ b/roles/cord-profile/templates/carrierethernet-local-app.yaml.j2
@@ -28,7 +28,7 @@
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
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0-SNAPSHOT/ce-api-1.0.0-SNAPSHOT.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-local-app/1.0.0-SNAPSHOT/ecord-local-app-1.0.0-SNAPSHOT.oar, http://mavenrepo:8080/repository/org/opencord/ce/vee/1.0.0-SNAPSHOT/vee-1.0.0-SNAPSHOT.oar
dependencies: org.onosproject.drivers.microsemi, org.onosproject.netconf
@@ -39,4 +39,4 @@
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
+ install_dependencies: http://mavenrepo:8080/repository/org/opencord/ce/ce-api/1.0.0-SNAPSHOT/ce-api-1.0.0-SNAPSHOT.oar, http://mavenrepo:8080/repository/org/opencord/ce/ecord-local-app/1.0.0-SNAPSHOT/ecord-local-app-1.0.0-SNAPSHOT.oar, http://mavenrepo:8080/repository/org/opencord/ce/co/1.0.0-SNAPSHOT/co-1.0.0-SNAPSHOT.oar
\ No newline at end of file
diff --git a/roles/cord-profile/templates/vee-service.yaml.j2 b/roles/cord-profile/templates/vee-service.yaml.j2
index 5b4f49f..ad4202c 100644
--- a/roles/cord-profile/templates/vee-service.yaml.j2
+++ b/roles/cord-profile/templates/vee-service.yaml.j2
@@ -28,13 +28,6 @@
topology_template:
node_templates:
- service#ONOS_Fabric:
- type: tosca.nodes.ONOSService
- properties:
- no-delete: true
- no-create: true
- no-update: true
-
service#veg:
type: tosca.nodes.VEGService
requirements:
@@ -61,27 +54,3 @@
translation: none
vtn_kind: vee
- CarrierEthernet_ONOS_app:
- 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.ecord.carrierethernet, org.opencord.ce.local.co
-