[COMAC-177,COMAC-131] Refactor comac profile for residential  service in CiaB

Change-Id: I362ed3564da5721b5512fd4eddc24c40407435e5
diff --git a/xos-profiles/comac/templates/_tosca.tpl b/xos-profiles/comac/templates/_tosca.tpl
index 68b97d8..9169540 100644
--- a/xos-profiles/comac/templates/_tosca.tpl
+++ b/xos-profiles/comac/templates/_tosca.tpl
@@ -36,7 +36,7 @@
           rest_hostname: {{ .onosRestService | quote }}
           rest_port: 8181
 
-{{- if $.wired_service.enabled }}
+{{- if $.resdentialService.enabled }}
     onos_app#openflow-base:
       type: tosca.nodes.ONOSApp
       properties:
@@ -258,7 +258,7 @@
   - custom_types/mcordsubscriberservice.yaml
   - custom_types/onosservice.yaml
   - custom_types/vrouterservice.yaml
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
   - custom_types/rcordservice.yaml
   - custom_types/voltservice.yaml
   - custom_types/fabriccrossconnectservice.yaml
@@ -294,7 +294,7 @@
         name: mcord
         must-exist: true
 
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
     service#rcord:
       type: tosca.nodes.RCORDService
       properties:
@@ -358,7 +358,7 @@
             node: service#fabric
             relationship: tosca.relationships.BelongsToOne
 
-{{- if .Values.wired_service.enabled }}
+{{- if .Values.resdentialService.enabled }}
     service_dependency#rcord_volt:
       type: tosca.nodes.ServiceDependency
       properties: