Fix yaml on global node
Change-Id: I7209a273bcab3b3d263257c63896dd28255a6752
diff --git a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2 b/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
index cc0f896..e91a9ec 100644
--- a/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
+++ b/use-cases/e-cord/onf/global-vnaas-service.yaml.j2
@@ -1,19 +1,18 @@
+---
-{#
-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.
-#}
+# 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
@@ -26,46 +25,12 @@
topology_template:
node_templates:
- enterpriselocation#onlab1:
- type: tosca.nodes.EnterpriseLocation
- requirements:
- properties:
- name: onlab
- cord_site_ip: 10.90.1.30
- cord_site_port: 8181
- cord_site_username: onos
- cord_site_password: rocks
- cord_site_type: onos
-
-
- enterpriselocation#onlab2:
- type: tosca.nodes.EnterpriseLocation
- requirements:
- properties:
- name: onlab1
- cord_site_ip: 10.90.1.50
- cord_site_port: 8181
- cord_site_username: onos
- cord_site_password: rocks
- cord_site_type: onos
-
- enterpriselocation#onlab3:
- type: tosca.nodes.EnterpriseLocation
- requirements:
- properties:
- name: onlab1
- cord_site_ip: 10.90.1.70
- cord_site_port: 8181
- cord_site_username: onos
- cord_site_password: rocks
- cord_site_type: onos
-
- onosmodel#onlab:
+ onosmodel#onf:
type: tosca.nodes.OnosModel
requirements:
properties:
- name: onlabT
- onos_ip: onos-cord
+ name: onfGlobalONOS
+ onos_ip: 127.0.0.1
onos_port: 8182
onos_username: onos
onos_password: rocks
@@ -115,7 +80,7 @@
type: tosca.nodes.UserNetworkInterface
requirements:
properties:
- tenant: onlab
+ tenant: onf
name: uni1
latlng: [37.973535, -122.531087]
cpe_id: netconf:10.6.0.160:830/0
@@ -124,7 +89,7 @@
type: tosca.nodes.UserNetworkInterface
requirements:
properties:
- tenant: onlab
+ tenant: onf
name: uni2
latlng: [37.773972, -122.431297]
cpe_id: netconf:10.6.0.161:830/0
@@ -133,18 +98,18 @@
type: tosca.nodes.UserNetworkInterface
requirements:
properties:
- tenant: onlab
+ tenant: onf
name: uni3
latlng: [37.871637, -122.259750]
cpe_id: netconf:10.6.0.162:830/0
- eline#testeline:
- type: tosca.nodes.ELine
- requirements:
- properties:
- name: testeline
- connect_point_1_id: netconf:10.6.0.160:830/0
- connect_point_2_id: netconf:10.6.0.161:830/0
- vlanids: 100
- cord_site_name: onlabT
- bwp: gold
+ # eline#testeline:
+ # type: tosca.nodes.ELine
+ # requirements:
+ # properties:
+ # name: testeline
+ # connect_point_1_id: netconf:10.6.0.160:830/0
+ # connect_point_2_id: netconf:10.6.0.161:830/0
+ # vlanids: 100
+ # cord_site_name: onfGlobalONOS
+ # bwp: gold