Updated Branches: refs/heads/master 99ee0ba9a -> 49b88472a
moving out NetScaler network element code from CloudStack core into plugins/network-elements/netscaler Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/49b88472 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/49b88472 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/49b88472 Branch: refs/heads/master Commit: 49b88472a5df819660a83d8db8bd962998d2494d Parents: 99ee0ba Author: Murali reddy <[email protected]> Authored: Thu Jun 21 18:57:18 2012 -0700 Committer: Murali reddy <[email protected]> Committed: Thu Jun 21 18:57:18 2012 -0700 ---------------------------------------------------------------------- .../response/NetscalerLoadBalancerResponse.java | 116 -- build/build-cloud.xml | 27 +- client/tomcatconf/components.xml.in | 8 +- .../cloud/network/resource/NetscalerResource.java | 1533 --------------- .../deployment-planner/user-dispersing/.classpath | 10 - .../deployment-planner/user-dispersing/.project | 17 - .../.settings/org.eclipse.jdt.core.prefs | 12 - .../deployment-planner/user-dispersing/build.xml | 609 ------ .../com/cloud/deploy/UserDispersingPlanner.java | 215 -- plugins/network-elements/netscaler/.classpath | 10 + plugins/network-elements/netscaler/.project | 17 + plugins/network-elements/netscaler/build.xml | 129 ++ .../api/commands/AddNetscalerLoadBalancerCmd.java | 129 ++ .../ConfigureNetscalerLoadBalancerCmd.java | 136 ++ .../commands/DeleteNetscalerLoadBalancerCmd.java | 100 + .../ListNetscalerLoadBalancerNetworksCmd.java | 94 + .../commands/ListNetscalerLoadBalancersCmd.java | 102 + .../response/NetscalerLoadBalancerResponse.java | 116 ++ .../src/com/cloud/network/NetScalerPodVO.java | 61 + .../src/com/cloud/network/dao/NetScalerPodDao.java | 24 + .../com/cloud/network/dao/NetScalerPodDaoImpl.java | 57 + .../cloud/network/element/NetscalerElement.java | 784 ++++++++ .../NetscalerLoadBalancerElementService.java | 69 + .../cloud/network/resource/NetscalerResource.java | 1533 +++++++++++++++ .../api/commands/AddNetscalerLoadBalancerCmd.java | 129 -- .../ConfigureNetscalerLoadBalancerCmd.java | 136 -- .../commands/DeleteNetscalerLoadBalancerCmd.java | 100 - .../ListNetscalerLoadBalancerNetworksCmd.java | 94 - .../commands/ListNetscalerLoadBalancersCmd.java | 102 - .../configuration/DefaultComponentLibrary.java | 5 - .../network/ExternalNetworkDeviceManagerImpl.java | 18 - server/src/com/cloud/network/NetScalerPodVO.java | 61 - .../src/com/cloud/network/dao/NetScalerPodDao.java | 24 - .../com/cloud/network/dao/NetScalerPodDaoImpl.java | 57 - .../cloud/network/element/NetscalerElement.java | 784 -------- .../NetscalerLoadBalancerElementService.java | 69 - 36 files changed, 3385 insertions(+), 4102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/49b88472/api/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java b/api/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java deleted file mode 100644 index bbbfca5..0000000 --- a/api/src/com/cloud/api/response/NetscalerLoadBalancerResponse.java +++ /dev/null @@ -1,116 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.api.response; - -import java.util.List; - -import com.cloud.api.ApiConstants; -import com.cloud.api.Parameter; -import com.cloud.api.BaseCmd.CommandType; -import com.cloud.utils.IdentityProxy; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; - -@SuppressWarnings("unused") -public class NetscalerLoadBalancerResponse extends BaseResponse { - - @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_ID) @Param(description="device id of the netscaler load balancer") - private IdentityProxy id = new IdentityProxy("external_load_balancer_devices"); - - @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network to which this netscaler device belongs to") - private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network"); - - @SerializedName(ApiConstants.PROVIDER) @Param(description="name of the provider") - private String providerName; - - @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_NAME) @Param(description="device name") - private String deviceName; - - @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_STATE) @Param(description="device state") - private String deviceState; - - @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_CAPACITY) @Param(description="device capacity") - private Long deviceCapacity; - - @SerializedName(ApiConstants.LOAD_BALANCER_DEVICE_DEDICATED) @Param(description="true if device is dedicated for an account") - private Boolean dedicatedLoadBalancer; - - @SerializedName(ApiConstants.INLINE) @Param(description="true if device is inline with firewall device") - private Boolean inlineLoadBalancer; - - @SerializedName(ApiConstants.PUBLIC_INTERFACE) @Param(description="the public interface of the load balancer") - private String publicInterface; - - @SerializedName(ApiConstants.PRIVATE_INTERFACE) @Param(description="the private interface of the load balancer") - private String privateInterface; - - @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external load balancer") - private String ipAddress; - - @SerializedName(ApiConstants.POD_IDS) @Param(description="Used when NetScaler device is provider of EIP service." + - " This parameter represents the list of pod's, for which there exists a policy based route on datacenter L3 router to " + - "route pod's subnet IP to a NetScaler device.") - private List<Long> podIds; - - public void setId(long lbDeviceId) { - this.id.setValue(lbDeviceId); - } - - public void setPhysicalNetworkId(long physicalNetworkId) { - this.physicalNetworkId.setValue(physicalNetworkId); - } - - public void setProvider(String provider) { - this.providerName = provider; - } - - public void setDeviceName(String deviceName) { - this.deviceName = deviceName; - } - - public void setDeviceCapacity(long deviceCapacity) { - this.deviceCapacity = deviceCapacity; - } - - public void setDedicatedLoadBalancer(boolean isDedicated) { - this.dedicatedLoadBalancer = isDedicated; - } - - public void setDeviceState(String deviceState) { - this.deviceState = deviceState; - } - - public void setInlineMode(boolean inline) { - this.inlineLoadBalancer = inline; - } - - public void setPublicInterface(String publicInterface) { - this.publicInterface = publicInterface; - } - - public void setPrivateInterface(String privateInterface) { - this.privateInterface = privateInterface; - } - - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public void setAssociatedPods(List<Long> pods) { - this.podIds = pods; - } -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/49b88472/build/build-cloud.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 1ec2afb..38f2288 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -285,7 +285,6 @@ </copy> </target> - <target name="build-ovm" depends="compile-ovm" /> <target name="build-server" depends="compile-server"> <mkdir dir="${server.dist.dir}" /> @@ -480,7 +479,7 @@ <target name="build-servers" depends="-init, build-server" /> - <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso"> + <target name="build-opensource" depends="-init, build-server, build-agent, build-scripts, build-ui, build-console-proxy, build-ovm, package-oss-systemvm-iso, build-netscaler, build-dp-user-dispersing"> <copy overwrite="true" todir="${dist.dir}"> <fileset dir="${base.dir}/build/deploy/"> <include name="deploy-agent.sh" /> @@ -586,17 +585,29 @@ <delete dir="${dist.dir}" /> <delete dir="${unittest.dir}"/> </target> - + + <target name="compile-all" description="Compile all of the jars" depends="compile-utils, compile-api, compile-core, compile-server, compile-ovm, compile-netscaler"/> + + <target name="clean-all" depends="clean, clean-awsapi" description="Clean all of the generated files, including dependency cache and javadoc"> + <delete dir="${target.dir}" /> + </target> + <!-- ===================== Ovm.Jar ===================== --> <target name="compile-ovm" depends="-init, compile-server" description="Compile OVM"> <ant antfile="${base.dir}/plugins/hypervisors/ovm/build.xml" target="build"/> </target> + <target name="build-ovm" depends="compile-ovm" /> - <target name="compile-all" description="Compile all of the jars" depends="compile-utils, compile-api, compile-core, compile-server, compile-ovm"/> - - <target name="clean-all" depends="clean, clean-awsapi" description="Clean all of the generated files, including dependency cache and javadoc"> - <delete dir="${target.dir}" /> + <!-- =====================cloud-dp-user-dispersing.jar.Jar ===================== --> + <target name="compile-dp-user-dispersing" depends="-init, compile-server" description="Compile dp-user-dispersing"> + <ant antfile="${base.dir}/plugins/deployment-planners/user-dispersing/build.xml" target="build"/> </target> -</project> + <target name="build-dp-user-dispersing" depends="compile-dp-user-dispersing" /> + <!-- ===================== Cloud-Plugin-Netscaler.Jar ===================== --> + <target name="compile-netscaler" depends="-init, compile-server" description="Compile NetScaler plugin"> + <ant antfile="${base.dir}/plugins/network-elements/netscaler/build.xml" target="build"/> + </target> + <target name="build-netscaler" depends="compile-netscaler"/> +</project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/49b88472/client/tomcatconf/components.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index 48869b5..861a622 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -133,9 +133,9 @@ <adapter name="DomainChecker" class="com.cloud.acl.DomainChecker"/> </adapters> <adapters key="com.cloud.network.element.NetworkElement"> - <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> - <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/> - <adapter name="F5BigIp" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> + <adapter name="JuniperSRX" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> + <adapter name="Netscaler" class="com.cloud.network.element.NetscalerElement"/> + <adapter name="F5BigIp" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/> <adapter name="Ovs" class="com.cloud.network.element.OvsElement"/> <adapter name="ExternalDhcpServer" class="com.cloud.network.element.ExternalDhcpElement"/> @@ -158,6 +158,8 @@ <adapter name="BasicAgentAuthorizer" class="com.cloud.agent.manager.authn.impl.BasicAgentAuthManager"/> </adapters> <pluggableservice name="VirtualRouterElementService" key="com.cloud.network.element.VirtualRouterElementService" class="com.cloud.network.element.VirtualRouterElement"/> + <pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/> + <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/> </management-server> <configuration-server class="com.cloud.server.ConfigurationServerImpl">
