CORD-2562 Update sample to new tosca engine

Change-Id: Ie1e40485f287380febc82e02a76973784bffad31
diff --git a/examples/vnaasglobal-service-reference.yaml b/examples/vnaasglobal-service-reference.yaml
index 92fcce6..3ae4e91 100644
--- a/examples/vnaasglobal-service-reference.yaml
+++ b/examples/vnaasglobal-service-reference.yaml
@@ -17,8 +17,10 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-   - custom_types/xos.yaml
-   - custom_types/vnaas.yaml
+   - custom_types/bandwidthprofile.yaml
+   - custom_types/eline.yaml
+   - custom_types/onosmodel.yaml
+   - custom_types/usernetworkinterface.yaml
 
 description: vnaasglobal services, generated by platform-install
 
@@ -27,7 +29,6 @@
 
     onosmodel#onf:
       type: tosca.nodes.OnosModel
-      requirements:
       properties:
         name: onfGlobalONOS
         onos_ip: onos-cord
@@ -38,8 +39,8 @@
 
     bandwidthprofile#bronze:
       type: tosca.nodes.BandwidthProfile
-      requirements:
       properties:
+        name: bronze
         cbs: 1000
         ebs: 1200
         cir: 1000
@@ -48,8 +49,8 @@
 
     bandwidthprofile#silver:
       type: tosca.nodes.BandwidthProfile
-      requirements:
       properties:
+        name: silver
         cbs: 1500
         ebs: 2000
         cir: 10000
@@ -58,8 +59,8 @@
 
     bandwidthprofile#gold:
       type: tosca.nodes.BandwidthProfile
-      requirements:
       properties:
+        name: gold
         cbs: 2000
         ebs: 2700
         cir: 20000
@@ -68,21 +69,43 @@
 
     bandwidthprofile#platinum:
       type: tosca.nodes.BandwidthProfile
-      requirements:
       properties:
+        name: platinum
         cbs: 2500
         ebs: 3200
         cir: 100000
         eir: 10000
         name: platinum
 
-    # eline#testeline:
-    #   type: tosca.nodes.ELine
-    #   requirements:
-    #   properties:
-    #     name: testeline
-    #     connect_point_1_id: domain:10.90.1.30-cord-onos/1
-    #     connect_point_2_id: domain:10.90.1.50-cord-onos/1
-    #     vlanids: 100
-    #     cord_site_name: onfGlobalONOS
-    #     bwp: gold
\ No newline at end of file
+#    UserNetworkInterface1:
+#      type: tosca.nodes.UserNetworkInterface
+#      properties:
+#         tenant: onf
+#         name: uni1
+#         latlng: "[37.973535, -122.531087]"
+#         cpe_id: domain:10.90.1.30-cord-onos/1
+#
+#    UserNetworkInterface2:
+#       type: tosca.nodes.UserNetworkInterface
+#       properties:
+#         tenant: onf
+#         name: uni2
+#         latlng: "[37.773972, -122.431297]"
+#         cpe_id: domain:10.90.1.50-cord-onos/1
+#
+#    eline#testeline:
+#       type: tosca.nodes.ELine
+#       properties:
+#         name: testeline
+#         vlanids: "100"
+#         cord_site_name: onfGlobalONOS
+#       requirements:
+#         - bwp:
+#             node: bandwidthprofile#gold
+#             relationship: tosca.relationships.BelongsToOne
+#         - connect_point_1:
+#             node: UserNetworkInterface1
+#             relationship: tosca.relationships.BelongsToOne
+#         - connect_point_2:
+#             node: UserNetworkInterface2
+#             relationship: tosca.relationships.BelongsToOne
\ No newline at end of file