Updated Branches: refs/heads/cisco-vnmc-api-integration ef069b332 -> 9c94b6d23
Fixed XML to create static route in VNMC correctly Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9c94b6d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9c94b6d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9c94b6d2 Branch: refs/heads/cisco-vnmc-api-integration Commit: 9c94b6d231d851c24e6605b6645931f39caff548 Parents: ef069b3 Author: Koushik Das <[email protected]> Authored: Fri Mar 8 22:20:23 2013 +0530 Committer: Koushik Das <[email protected]> Committed: Fri Mar 8 22:20:23 2013 +0530 ---------------------------------------------------------------------- .../network/cisco/create-edge-device-route.xml | 2 +- .../network/cisco/CiscoVnmcConnectionImpl.java | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9c94b6d2/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml ---------------------------------------------------------------------- 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 91b10a3..937378b 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" http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9c94b6d2/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java ---------------------------------------------------------------------- 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 e7c7091..02e89d1 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
