From 9c94b6d231d851c24e6605b6645931f39caff548 Mon Sep 17 00:00:00 2001
From: Koushik Das <koushik.das@citrix.com>
Date: Fri, 8 Mar 2013 22:20:23 +0530
Subject: [PATCH] Fixed XML to create static route in VNMC correctly

---
 .../scripts/network/cisco/create-edge-device-route.xml    | 2 +-
 .../com/cloud/network/cisco/CiscoVnmcConnectionImpl.java  | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml
index 91b10a34213..937378b566d 100644
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml
@@ -2,7 +2,7 @@
   cookie="%cookie%"
   inHierarchical="false">
   <inConfigs>
-    <pair key="%routedn%">
+    <pair key="%routepolicydn%/sroute-2">
       <routeStaticRoute
         dn="%routepolicydn%/sroute-2"
         id="2"
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
index e7c709115a6..02e89d1603c 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -328,16 +328,14 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection {
         String xml = VnmcXml.CREATE_EDGE_ROUTE.getXml();
         String service = VnmcXml.CREATE_EDGE_ROUTE.getService();
         xml = replaceXmlValue(xml, "cookie", _cookie);
-        xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceRoutePolicy(tenantName));
+        xml = replaceXmlValue(xml, "routepolicydn", getDnForEdgeDeviceRoutingPolicy(tenantName));
         xml = replaceXmlValue(xml, "nexthop", nextHopIp);
         xml = replaceXmlValue(xml, "nexthopintf", getNameForEdgeOutsideIntf(tenantName));
         xml = replaceXmlValue(xml, "destination", destination);
         xml = replaceXmlValue(xml, "netmask", netmask);
 
-        //TODO: this adds default route, make it more generic
-
-         String response =  sendRequest(service, xml);
-         return verifySuccess(response);
+        String response =  sendRequest(service, xml);
+        return verifySuccess(response);
     }
 
     @Override