Updated Branches: refs/heads/master 422c4ce51 -> 392ae5cb1
moving out Srx code into Plugins/network-elements Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/392ae5cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/392ae5cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/392ae5cb Branch: refs/heads/master Commit: 392ae5cb1324eaee96aff75ead92f3c36c309bec Parents: 422c4ce Author: Murali reddy <[email protected]> Authored: Mon Jun 25 16:55:53 2012 -0700 Committer: Murali reddy <[email protected]> Committed: Mon Jun 25 16:55:53 2012 -0700 ---------------------------------------------------------------------- .../cloud/api/response/SrxFirewallResponse.java | 138 - build/build-cloud.xml | 10 +- client/tomcatconf/components.xml.in | 1 + .../cloud/network/resource/JuniperSrxResource.java | 3204 --------------- .../com/cloud/api/AddExternalLoadBalancerCmd.java | 105 - .../cloud/api/DeleteExternalLoadBalancerCmd.java | 83 - .../cloud/api/ListExternalLoadBalancersCmd.java | 82 - .../api/commands/AddExternalLoadBalancerCmd.java | 105 + .../commands/DeleteExternalLoadBalancerCmd.java | 83 + .../api/commands/ListExternalLoadBalancersCmd.java | 82 + plugins/network-elements/juniper-srx/.classpath | 11 + plugins/network-elements/juniper-srx/.project | 17 + plugins/network-elements/juniper-srx/build.xml | 129 + .../cloud/api/commands/AddExternalFirewallCmd.java | 106 + .../com/cloud/api/commands/AddSrxFirewallCmd.java | 129 + .../api/commands/ConfigureSrxFirewallCmd.java | 109 + .../api/commands/DeleteExternalFirewallCmd.java | 82 + .../cloud/api/commands/DeleteSrxFirewallCmd.java | 99 + .../api/commands/ListExternalFirewallsCmd.java | 82 + .../api/commands/ListSrxFirewallNetworksCmd.java | 94 + .../cloud/api/commands/ListSrxFirewallsCmd.java | 102 + .../cloud/api/response/SrxFirewallResponse.java | 138 + .../element/JuniperSRXExternalFirewallElement.java | 545 +++ .../element/JuniperSRXFirewallElementService.java | 83 + .../cloud/network/resource/JuniperSrxResource.java | 3204 +++++++++++++++ .../cloud/api/commands/AddExternalFirewallCmd.java | 106 - .../com/cloud/api/commands/AddSrxFirewallCmd.java | 129 - .../api/commands/ConfigureSrxFirewallCmd.java | 109 - .../api/commands/DeleteExternalFirewallCmd.java | 82 - .../cloud/api/commands/DeleteSrxFirewallCmd.java | 99 - .../api/commands/ListExternalFirewallsCmd.java | 82 - .../api/commands/ListSrxFirewallNetworksCmd.java | 94 - .../cloud/api/commands/ListSrxFirewallsCmd.java | 102 - .../configuration/DefaultComponentLibrary.java | 3 - .../network/ExternalNetworkDeviceManagerImpl.java | 27 - .../element/JuniperSRXExternalFirewallElement.java | 545 --- .../element/JuniperSRXFirewallElementService.java | 83 - 37 files changed, 5209 insertions(+), 5075 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/392ae5cb/api/src/com/cloud/api/response/SrxFirewallResponse.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/response/SrxFirewallResponse.java b/api/src/com/cloud/api/response/SrxFirewallResponse.java deleted file mode 100644 index 08242bd..0000000 --- a/api/src/com/cloud/api/response/SrxFirewallResponse.java +++ /dev/null @@ -1,138 +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 com.cloud.api.ApiConstants; -import com.cloud.utils.IdentityProxy; -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; - -@SuppressWarnings("unused") -public class SrxFirewallResponse extends BaseResponse { - - @SerializedName(ApiConstants.FIREWALL_DEVICE_ID) @Param(description="device id of the SRX firewall") - private IdentityProxy id = new IdentityProxy("external_firewall_devices"); - - @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) @Param(description="the physical network to which this SRX firewall belongs to") - private IdentityProxy physicalNetworkId = new IdentityProxy("physical_network"); - - @SerializedName(ApiConstants.PROVIDER) @Param(description="name of the provider") - private String providerName; - - @SerializedName(ApiConstants.FIREWALL_DEVICE_NAME) @Param(description="device name") - private String deviceName; - - @SerializedName(ApiConstants.FIREWALL_DEVICE_STATE) @Param(description="device state") - private String deviceState; - - @SerializedName(ApiConstants.FIREWALL_DEVICE_CAPACITY) @Param(description="device capacity") - private Long deviceCapacity; - - @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of the external firewall") - private IdentityProxy zoneId = new IdentityProxy("data_center"); - - @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the management IP address of the external firewall") - private String ipAddress; - - @SerializedName(ApiConstants.USERNAME) @Param(description="the username that's used to log in to the external firewall") - private String username; - - @SerializedName(ApiConstants.PUBLIC_INTERFACE) @Param(description="the public interface of the external firewall") - private String publicInterface; - - @SerializedName(ApiConstants.USAGE_INTERFACE) @Param(description="the usage interface of the external firewall") - private String usageInterface; - - @SerializedName(ApiConstants.PRIVATE_INTERFACE) @Param(description="the private interface of the external firewall") - private String privateInterface; - - @SerializedName(ApiConstants.PUBLIC_ZONE) @Param(description="the public security zone of the external firewall") - private String publicZone; - - @SerializedName(ApiConstants.PRIVATE_ZONE) @Param(description="the private security zone of the external firewall") - private String privateZone; - - @SerializedName(ApiConstants.NUM_RETRIES) @Param(description="the number of times to retry requests to the external firewall") - private String numRetries; - - @SerializedName(ApiConstants.TIMEOUT) @Param(description="the timeout (in seconds) for requests to the external firewall") - private String timeout; - - 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 setDeviceState(String deviceState) { - this.deviceState = deviceState; - } - - public void setIpAddress(String ipAddress) { - this.ipAddress = ipAddress; - } - - public void setPublicInterface(String publicInterface) { - this.publicInterface = publicInterface; - } - - public void setUsageInterface(String usageInterface) { - this.usageInterface = usageInterface; - } - - public void setPrivateInterface(String privateInterface) { - this.privateInterface = privateInterface; - } - - public void setPublicZone(String publicZone) { - this.publicZone = publicZone; - } - - public void setPrivateZone(String privateZone) { - this.privateZone = privateZone; - } - - public String getNumRetries() { - return numRetries; - } - - public void setNumRetries(String numRetries) { - this.numRetries = numRetries; - } - - public String getTimeout() { - return timeout; - } - - public void setTimeout(String timeout) { - this.timeout = timeout; - } -} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/392ae5cb/build/build-cloud.xml ---------------------------------------------------------------------- diff --git a/build/build-cloud.xml b/build/build-cloud.xml index 5eabf8c..2b66801 100755 --- a/build/build-cloud.xml +++ b/build/build-cloud.xml @@ -479,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, build-netscaler, build-f5, build-dp-user-dispersing"> + <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-f5, build-srx, build-dp-user-dispersing"> <copy overwrite="true" todir="${dist.dir}"> <fileset dir="${base.dir}/build/deploy/"> <include name="deploy-agent.sh" /> @@ -586,7 +586,7 @@ <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, compile-f5"/> + <target name="compile-all" description="Compile all of the jars" depends="compile-utils, compile-api, compile-core, compile-server, compile-ovm, compile-netscaler, compile-f5, compile-srx"/> <target name="clean-all" depends="clean, clean-awsapi" description="Clean all of the generated files, including dependency cache and javadoc"> <delete dir="${target.dir}" /> @@ -616,4 +616,10 @@ </target> <target name="build-f5" depends="compile-f5"/> + <!-- ===================== Cloud-Plugin-Srx.Jar ===================== --> + <target name="compile-srx" depends="-init, compile-server" description="Compile SRX plugin"> + <ant antfile="${base.dir}/plugins/network-elements/juniper-srx/build.xml" target="build"/> + </target> + <target name="build-srx" depends="compile-srx"/> + </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/392ae5cb/client/tomcatconf/components.xml.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index 884e954..58541a5 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -160,6 +160,7 @@ <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"/> <pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/> + <pluggableservice name="JuniperSRXFirewallElementService" key="com.cloud.network.element.JuniperSRXFirewallElementService" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/> <dao name="NetScalerPodDao" class="com.cloud.network.dao.NetScalerPodDaoImpl" singleton="false"/> </management-server>
