From d74c6a9ac2efc939aa98c466bf0cd9bcf5e5563c Mon Sep 17 00:00:00 2001
From: Chiradeep Vittal <chiradeep@apache.org>
Date: Wed, 16 Jan 2013 15:32:45 -0800
Subject: [PATCH] WIP: fixes for associating ASA1000v to tenant

Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
---
 .../scripts/network/cisco/assoc-asa1000v.xml  | 20 ++++++++++---------
 .../cisco/list-unassigned-asa1000v.xml        |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
index 1ac8cead438..8d01470112d 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
@@ -1,14 +1,16 @@
 <configConfMo
-dn=""
-cookie="1349366974/592be573-8a27-48d3-aab1-cf6cb94f23ab"
-inHierarchical="false">
+  dn=""
+  cookie="%cookie%" 
+  inHierarchical="false">
     <inConfig>
-<fwResourceBinding
-assignedToDn="fw/inst-1007"
-
-dn="org-root/org-TenantD/org-VDC-TenantD/efw-ASA-1000v-TenantD/binding"
-
-status="created"/>
+      <fwResourceBinding
+          assignedToDn="%fwdn%" 
+          dn="%binddn%"
+          status="created"/>
     </inConfig>
 </configConfMo>
 
+<!--
+assignedToDn="fw/inst-1007"
+dn="org-root/org-TenantD/org-VDC-TenantD/efw-ASA-1000v-TenantD/binding"
+-->
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
index 31e2c071020..27f701bd63e 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
@@ -1,4 +1,3 @@
-<!--resource-mgr -->
 <configResolveChildren 
 cookie="%cookie%" 
 classId="fwInstance" 
@@ -12,6 +11,7 @@ inHierarchical="false">
     </inFilter> 
 </configResolveChildren> 
 
+<!-- resource-mgr -->
 <!--
 <configResolveChildren cookie="1349366974/592be573-8a27-48d3-aab1-cf6cb94f23ab" commCookie="5/12/0/1cae" srcExtSys="10.223.56.5" destExtSys="10.223.56.5" srcSvc="sam_extXMLApi" destSvc="resource-mgr_dme" response="yes" classId="fwInstance">
   <outConfigs>