[CORD-2349] Migrating REM-CORD

Change-Id: Iae573428e3bee89026262055263f24a32dd12183
diff --git a/roles/cord-profile/templates/wan-net.yaml.j2 b/roles/cord-profile/templates/wan-net.yaml.j2
index 4b9bb20..0ada8be 100644
--- a/roles/cord-profile/templates/wan-net.yaml.j2
+++ b/roles/cord-profile/templates/wan-net.yaml.j2
@@ -1,7 +1,10 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-   - custom_types/xos.yaml
+  - custom_types/network.yaml
+  - custom_types/networktemplate.yaml
+  - custom_types/slice.yaml
+  - custom_types/site.yaml
 
 description: wan network config, generated by platform-install
 
@@ -11,36 +14,41 @@
 # site, fully created in deployment.yaml
     {{ site_name }}:
       type: tosca.nodes.Site
+      properties:
+        name: {{ site_name }}
+        must-exist: true
 
 # wan network
     wan_template:
       type: tosca.nodes.NetworkTemplate
       properties:
+          name: wan_template
           visibility: private
           translation: none
           vtn_kind: PRIVATE
 
     wan_network:
-      type: tosca.nodes.network.Network
+      type: tosca.nodes.Network
       properties:
-          ip_version: 4
-          cidr: 102.0.0.0/24
+          name: wan_network
+          subnet: 102.0.0.0/24
       requirements:
-          - network_template:
+          - template:
               node: wan_template
-              relationship: tosca.relationships.UsesNetworkTemplate
+              relationship: tosca.relationships.BelongsToOne
           - owner:
               node: {{ site_name }}_wan
-              relationship: tosca.relationships.MemberOfSlice
+              relationship: tosca.relationships.BelongsToOne
 
     {{ site_name }}_wan:
       description: This slice exists solely to own the private network
       type: tosca.nodes.Slice
       properties:
+          name: {{ site_name }}_wan
           network: noauto
       requirements:
           - site:
               node: {{ site_name }}
-              relationship: tosca.relationships.MemberOfSite
+              relationship: tosca.relationships.BelongsToOne