Update Tosca to follow the new modeling

Change-Id: I48cb2404762ecaad085fdc9ed3e2f146ddb5b6b0
diff --git a/xos/metronet.m4 b/xos/metronet.m4
index 784af54..60796f9 100644
--- a/xos/metronet.m4
+++ b/xos/metronet.m4
@@ -7,7 +7,7 @@
 
 node_types:
     
-    tosca.nodes.MetroNetworkService:
+    tosca.nodes.MetroNetworkSystem:
         derived_from: tosca.nodes.Root
         description: >
             CORD: The Metro Network Service.
@@ -15,7 +15,13 @@
             xos_base_service_caps
         properties:
             xos_base_props
-            xos_base_service_props
+            administrativeState:
+                type: string
+                required: true
+            restUrl:
+                type: string
+                required: false
+
 
     tosca.nodes.MetroNetworkDevice:
         derived_from: tosca.nodes.Root
@@ -38,3 +44,6 @@
             authType:
                 type: string
                 required: false
+            id:
+                type: string
+                required: true