Add dhcpl2relay and aaa app config to rcord-lite

Change-Id: I31683324c8777f19ccaa1ee49878763f48395894
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index da5acaa..e9d61a7 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -165,9 +165,31 @@
       properties:
         name: org.opencord.olt
         app_id: org.opencord.olt
+        version: 1.4.1
+      requirements:
+        - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
+
+    onos_app#dhcpl2relay:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: org.opencord.dhcpl2relay
+        app_id: org.opencord.dhcpl2relay
         version: 1.4.0
       requirements:
         - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
+
+    onos_app#aaa:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: org.opencord.aaa
+        app_id: org.opencord.aaa
+        version: 1.6.0
+      requirements:
+        - owner:
             node: service#ONOS_VOLTHA
             relationship: tosca.relationships.BelongsToOne
 
@@ -175,7 +197,7 @@
     cord-config-attr:
       type: tosca.nodes.ServiceInstanceAttribute
       properties:
-        name: /onos/v1/network/configuration/apps/org.opencord.olt
+        name: /onos/v1/network/configuration/apps/org.opencord.kafka
         value: >
           {
             "kafka" : {
@@ -199,4 +221,37 @@
         - service_instance:
             node: onos_app#olt
             relationship: tosca.relationships.BelongsToOne
+
+    dhcpl2relay-config-attr:
+      type: tosca.nodes.ServiceInstanceAttribute
+      properties:
+        name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+        value: >
+          {
+            "dhcpl2relay" : {
+              "useOltUplinkForServerPktInOut" : true
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#dhcpl2relay
+            relationship: tosca.relationships.BelongsToOne
+
+    aaa-config-attr:
+      type: tosca.nodes.ServiceInstanceAttribute
+      properties:
+        name: /onos/v1/network/configuration/apps/org.opencord.aaa
+        value: >
+          {
+            "AAA" : {
+              "radiusConnectionType" : "socket",
+              "radiusHost" : "freeradius",
+              "radiusServerPort" : "1812",
+              "radiusSecret" : "SECRET"
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#aaa
+            relationship: tosca.relationships.BelongsToOne
 {{- end -}}