From 43e29974215a73788b249f246d7e62825cf8b4e6 Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Wed, 13 Mar 2013 11:51:59 +0530 Subject: [PATCH] Changes related to instantiating the dao components --- .../tomcatconf/nonossComponentContext.xml.in | 6 ++++-- .../response/CiscoVnmcResourceResponse.java | 5 +++-- .../network/dao/CiscoAsa1000vDaoImpl.java | 3 +++ .../cloud/network/dao/CiscoVnmcDaoImpl.java | 3 +++ .../dao/NetworkAsa1000vMapDaoImpl.java | 3 +++ .../network/resource/CiscoVnmcResource.java | 20 +++++++++++-------- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 89bd49be374..e638b2c28cf 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -39,7 +39,7 @@ - + @@ -103,7 +103,9 @@ - + + + diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java index 4bbde68679b..f5c9b727f8f 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java @@ -29,12 +29,13 @@ import com.google.gson.annotations.SerializedName; public class CiscoVnmcResourceResponse extends BaseResponse { public static final String RESOURCE_NAME = "resourcename"; - @SerializedName(ApiConstants.RESOURCE_ID) @Parameter(description="resource id of the Cisco VNMC controller") + @SerializedName(ApiConstants.RESOURCE_ID) + @Parameter(description="resource id of the Cisco VNMC controller") private String id; @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Parameter(description="the physical network to which this VNMC belongs to", entityType = PhysicalNetworkResponse.class) - private Long physicalNetworkId ; + private Long physicalNetworkId; public Long getPhysicalNetworkId() { return physicalNetworkId; diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java index 3046045bf13..a5820dea48b 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value=CiscoAsa1000vDao.class) public class CiscoAsa1000vDaoImpl extends GenericDaoBase implements CiscoAsa1000vDao { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java index 69c56c165a3..89518104851 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java @@ -20,12 +20,15 @@ import java.util.List; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.cisco.CiscoVnmcControllerVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value=CiscoVnmcDao.class) public class CiscoVnmcDaoImpl extends GenericDaoBase implements CiscoVnmcDao { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java index 7326a90e3d7..692b3d6fda6 100755 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java @@ -18,12 +18,15 @@ package com.cloud.network.dao; import javax.ejb.Local; +import org.springframework.stereotype.Component; + import com.cloud.network.cisco.NetworkAsa1000vMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; +@Component @Local(value=NetworkAsa1000vMapDao.class) public class NetworkAsa1000vMapDaoImpl extends GenericDaoBase implements NetworkAsa1000vMapDao { diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java index a489b1dbe39..02428ffdf89 100644 --- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java @@ -52,6 +52,7 @@ import com.cloud.agent.api.to.PortForwardingRuleTO; import com.cloud.agent.api.to.StaticNatRuleTO; import com.cloud.host.Host; import com.cloud.network.cisco.CiscoVnmcConnectionImpl; +import com.cloud.network.rules.FirewallRule.TrafficType; import com.cloud.resource.ServerResource; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; @@ -352,15 +353,18 @@ public class CiscoVnmcResource implements ServerResource { throw new Exception("Failed to delete ACL ingress rule in VNMC for guest network with vlan " + vlanId); } } else { - String[] externalIpRange = getIpRangeFromCidr(rule.getSourceCidrList().get(0)); - if (!_connection.createTenantVDCIngressAclRule(tenant, - Long.toString(rule.getId()), policyIdentifier, - rule.getProtocol().toUpperCase(), externalIpRange[0], externalIpRange[1], - Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]), publicIp)) { - throw new Exception("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); - } + if (rule.getTrafficType() == TrafficType.Ingress) { + String[] externalIpRange = getIpRangeFromCidr(rule.getSourceCidrList().get(0)); + if (!_connection.createTenantVDCIngressAclRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), externalIpRange[0], externalIpRange[1], + Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]), publicIp)) { + throw new Exception("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); + } + } else { + // TODO for egress + } } - // TODO for egress } }