You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/01/17 01:38:52 UTC

[10/15] git commit: WIP: fixes for associating ASA1000v to tenant

WIP: fixes for associating ASA1000v to tenant

Signed-off-by: Chiradeep Vittal <ch...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d74c6a9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d74c6a9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d74c6a9a

Branch: refs/heads/cisco-vnmc-api-integration
Commit: d74c6a9ac2efc939aa98c466bf0cd9bcf5e5563c
Parents: 9350d10
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Wed Jan 16 15:32:45 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Wed Jan 16 15:32:45 2013 -0800

----------------------------------------------------------------------
 .../scripts/network/cisco/assoc-asa1000v.xml       |   20 ++++++++------
 .../network/cisco/list-unassigned-asa1000v.xml     |    2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d74c6a9a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml
----------------------------------------------------------------------
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 1ac8cea..8d01470 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"
+-->

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d74c6a9a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml
----------------------------------------------------------------------
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 31e2c07..27f701b 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>