CORD-2082 fix ecord-test-subscriber roles
Change-Id: I6636fcd780a91478c35bdc9efea331fd46a78e03
(cherry picked from commit 33a71b4b1d05aab7418cf89a9cec09c4df374150)
diff --git a/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2 b/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
index a5c9aeb..8420b61 100644
--- a/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
+++ b/roles/test-ecord-subscriber-config/templates/test-ecord-subscriber.yaml.j2
@@ -80,25 +80,22 @@
node: {{ site_name }}_veg
relationship: tosca.relationships.DependsOn
+ # Subscribers require a service in 4.0, so make sure we have an ecordlocal service.
+ # FIXME: Move to a different tosca recipe?
+ service#ecordlocal:
+ type: tosca.nodes.Service
+
# A subscriber
My Enterprise:
- type: tosca.nodes.Subscriber
- properties:
- requirements:
-
- My vEG:
type: tosca.nodes.Tenant
properties:
service_specific_id: 123
requirements:
- provider_service:
- node: service#vrouter
+ node: service#ecordlocal
relationship: tosca.relationships.MemberOfService
- - subscriber_tenant:
- node: service#vrouter
- relationship: tosca.relationships.BelongsToTenant
- My vEE:
+ My vEG:
type: tosca.nodes.Tenant
properties:
service_specific_id: 123
@@ -107,11 +104,20 @@
node: service#veg
relationship: tosca.relationships.MemberOfService
- subscriber_tenant:
- node: service#vee
+ node: My vEE
relationship: tosca.relationships.BelongsToTenant
+
+ My vEE:
+ type: tosca.nodes.Tenant
+ properties:
+ service_specific_id: 123
+ requirements:
+ - provider_service:
+ node: service#vee
+ relationship: tosca.relationships.MemberOfService
- subscriber:
node: My Enterprise
relationship: tosca.relationships.BelongsToSubscriber
- - dependency:
- node: {{ site_name }}_veg
- relationship: tosca.relationships.DependsOn
+# - dependency:
+# node: {{ site_name }}_veg
+# relationship: tosca.relationships.DependsOn
diff --git a/roles/test-ecord-subscriber-enable/defaults/main.yml b/roles/test-ecord-subscriber-enable/defaults/main.yml
new file mode 100644
index 0000000..697fc3c
--- /dev/null
+++ b/roles/test-ecord-subscriber-enable/defaults/main.yml
@@ -0,0 +1,20 @@
+
+# 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.
+
+
+---
+# ecord-test-subscriber-enable/defaults/main.yml
+
+xos_admin_user: "xosadmin@opencord.org"