From 5f7a8a04365284fd4a170f02f02fa83abe646499 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 1 Oct 2012 12:21:41 -0400 Subject: [PATCH 01/45] CLOUDSTACK-162 - Added license header --- .../redundant_router/arping_gateways.sh.templ | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ b/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ index 80f7f030dcb..176bce22559 100644 --- a/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ +++ b/patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ @@ -1,3 +1,20 @@ +# 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. + ip link|grep BROADCAST|grep -v eth0|grep -v eth1|cut -d ":" -f 2 > /tmp/iflist while read i do From f212177146b375cc2e4876afbcdd509b1e941e9b Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 1 Oct 2012 12:23:57 -0400 Subject: [PATCH 02/45] CLOUDSTACK-159 - Added license header --- .../root/redundant_router/keepalived.conf.templ | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ b/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ index e016bc95d35..a4969a5b698 100644 --- a/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ +++ b/patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ @@ -1,3 +1,20 @@ +! 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. + global_defs { router_id [ROUTER_ID] } From 39e4c60f3aaf751676b7e8dbbddabf011d7233a8 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 1 Oct 2012 12:34:46 -0400 Subject: [PATCH 03/45] CLOUDSTACK-147 - Adding rsyslog.conf to the public domain in our legal docs --- LICENSE | 2 ++ tools/whisker/descriptor.xml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/LICENSE b/LICENSE index 96952ecc65b..d43769fbf4b 100644 --- a/LICENSE +++ b/LICENSE @@ -2350,6 +2350,8 @@ Within the deps/awsapi-lib directory Within the patches/systemvm/debian/config/etc directory placed in the public domain + by Adiscon GmbH http://www.adiscon.com/ + rsyslog.conf by Simon Kelley dnsmasq.conf vpcdnsmasq.conf diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 0564d302fd1..007535def5c 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2409,6 +2409,10 @@ this distribution. id='libvirt.org' name='The libvirt project' url='http://libvirt.org/' /> + Copyright (c) 2012 The Apache Software Foundation @@ -2444,6 +2448,9 @@ Copyright (c) 2012 The Apache Software Foundation + + + From 63f7c12333ec67c8015b6d4f6ee8e1dee0de6cd2 Mon Sep 17 00:00:00 2001 From: Saksham Srivastava Date: Mon, 1 Oct 2012 22:54:39 +0530 Subject: [PATCH 04/45] no error message when we upload volume whose size is greater than storage.max.volume.upload.size value --- ui/scripts/storage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 418fe368129..dceaeb33234 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1004,6 +1004,7 @@ return toClearInterval; } }, + status: {label: 'label.status'}, type: { label: 'label.type' }, storagetype: { label: 'label.storage.type' }, hypervisor: { label: 'label.hypervisor' }, From 87e6278725af07905f267f35a4b36be68f1c00ca Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Thu, 27 Sep 2012 14:28:06 -0700 Subject: [PATCH 05/45] CS-16049 : VPC, VR provides metadata and user data through port 80, this port should be only open for targeting to this VR ip --- .../config/opt/cloud/bin/vpc_guestnw.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh index 90de218f471..ca03679fca1 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh @@ -66,6 +66,7 @@ setup_apache2() { sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/conf.d/vhost$dev.conf sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/conf.d/vhost$dev.conf service apache2 restart + sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 80 -j ACCEPT sudo iptables -A INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 80 -j ACCEPT } @@ -103,11 +104,14 @@ desetup_dnsmasq() { setup_passwdsvcs() { logger -t cloud "Setting up password service for network $ip/$mask, eth $dev " + sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT + sudo iptables -A INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT nohup bash /opt/cloud/bin/vpc_passwd_server $ip >/dev/null 2>&1 & } desetup_passwdsvcs() { logger -t cloud "Desetting up password service for network $ip/$mask, eth $dev " + sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT pid=`ps -ef | grep socat | grep $ip | grep -v grep | awk '{print $2}'` if [ -n "$pid" ] then @@ -122,17 +126,15 @@ create_guest_network() { sudo ip link set $dev up sudo arping -c 3 -I $dev -A -U -s $ip $ip # setup rules to allow dhcp/dns request - sudo iptables -D INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -D INPUT -i $dev -p udp -m udp --dport 53 -j ACCEPT - sudo iptables -A INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -A INPUT -i $dev -p udp -m udp --dport 53 -j ACCEPT - sudo iptables -D INPUT -i $dev -p tcp -m state --state NEW --dport 8080 -j ACCEPT - sudo iptables -D INPUT -i $dev -p tcp -m state --state NEW --dport 80 -j ACCEPT - sudo iptables -A INPUT -i $dev -p tcp -m state --state NEW --dport 8080 -j ACCEPT - sudo iptables -A INPUT -i $dev -p tcp -m state --state NEW --dport 80 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT + sudo iptables -A INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -A INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT # restore mark from connection mark local tableName="Table_$dev" sudo ip route add $subnet/$mask dev $dev table $tableName proto static + sudo iptables -t mangle -D PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark + sudo iptables -t nat -D POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip sudo iptables -t mangle -A PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark # set up hairpin sudo iptables -t nat -A POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip @@ -146,12 +148,10 @@ destroy_guest_network() { logger -t cloud " $(basename $0): Create network on interface $dev, gateway $gw, network $ip/$mask " sudo ip addr del dev $dev $ip/$mask - sudo iptables -D INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -D INPUT -i $dev -p udp -m udp --dport 53 -j ACCEPT - sudo iptables -D INPUT -i $dev -p tcp -m state --state NEW --dport 8080 -j ACCEPT - sudo iptables -D INPUT -i $dev -p tcp -m state --state NEW --dport 80 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT sudo iptables -t mangle -D PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark - sudo iptables -t nat -A POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip + sudo iptables -t nat -D POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip destroy_acl_chain desetup_dnsmasq desetup_apache2 From 12d12ac54c4244fc211d4613f4642837ff9aa397 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Thu, 27 Sep 2012 20:24:37 -0700 Subject: [PATCH 06/45] CS-16409 : dhcp request doesn't have target ip, remove ip in the iptable rule --- .../debian/config/opt/cloud/bin/vpc_guestnw.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh index ca03679fca1..faf62c6ff0c 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_guestnw.sh @@ -80,6 +80,11 @@ desetup_apache2() { setup_dnsmasq() { logger -t cloud "Setting up dnsmasq for network $ip/$mask " + # setup rules to allow dhcp/dns request + sudo iptables -D INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT + sudo iptables -A INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -A INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT # setup static sed -i -e "/^[#]*dhcp-range=interface:$dev/d" /etc/dnsmasq.d/cloud.conf echo "dhcp-range=interface:$dev,set:interface-$dev,$ip,static" >> /etc/dnsmasq.d/cloud.conf @@ -94,7 +99,9 @@ setup_dnsmasq() { desetup_dnsmasq() { logger -t cloud "Desetting up dnsmasq for network $ip/$mask " - + # remove rules to allow dhcp/dns request + sudo iptables -D INPUT -i $dev -p udp -m udp --dport 67 -j ACCEPT + sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,option:router.*$/d" /etc/dnsmasq.d/cloud.conf sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,6.*$/d" /etc/dnsmasq.d/cloud.conf sed -i -e "/^[#]*dhcp-range=interface:$dev/d" /etc/dnsmasq.d/cloud.conf @@ -125,11 +132,6 @@ create_guest_network() { sudo ip addr add dev $dev $ip/$mask brd + sudo ip link set $dev up sudo arping -c 3 -I $dev -A -U -s $ip $ip - # setup rules to allow dhcp/dns request - sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT - sudo iptables -A INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -A INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT # restore mark from connection mark local tableName="Table_$dev" sudo ip route add $subnet/$mask dev $dev table $tableName proto static @@ -148,8 +150,6 @@ destroy_guest_network() { logger -t cloud " $(basename $0): Create network on interface $dev, gateway $gw, network $ip/$mask " sudo ip addr del dev $dev $ip/$mask - sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 67 -j ACCEPT - sudo iptables -D INPUT -i $dev -d $ip -p udp -m udp --dport 53 -j ACCEPT sudo iptables -t mangle -D PREROUTING -i $dev -m state --state ESTABLISHED,RELATED -j CONNMARK --restore-mark sudo iptables -t nat -D POSTROUTING -s $subnet/$mask -o $dev -j SNAT --to-source $ip destroy_acl_chain From aa6355ffe6d14ae8e87c70795d94b6bc1a3ad1a1 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 1 Oct 2012 10:56:46 -0700 Subject: [PATCH 07/45] Updated master to 4.1.0 mvn release:update-versions -DautoVersionSubmodules=true -Dnonoss -P client,deps,developer -DdevelopmentVersion=4.1.0-SNAPSHOT --- agent/pom.xml | 5 ++--- api/pom.xml | 5 ++--- awsapi/pom.xml | 9 ++++----- client/pom.xml | 15 +++++++-------- console-proxy/pom.xml | 5 ++--- core/pom.xml | 5 ++--- deps/XenServerJava/pom.xml | 5 ++--- deps/pom.xml | 7 +++---- developer/pom.xml | 5 ++--- patches/pom.xml | 5 ++--- .../user-concentrated-pod/pom.xml | 5 ++--- .../deployment-planners/user-dispersing/pom.xml | 5 ++--- plugins/file-systems/netapp/pom.xml | 5 ++--- plugins/host-allocators/random/pom.xml | 5 ++--- plugins/hypervisors/kvm/pom.xml | 5 ++--- plugins/hypervisors/ovm/pom.xml | 5 ++--- plugins/hypervisors/vmware/pom.xml | 5 ++--- plugins/hypervisors/xen/pom.xml | 5 ++--- .../network-elements/elastic-loadbalancer/pom.xml | 5 ++--- plugins/network-elements/f5/pom.xml | 5 ++--- plugins/network-elements/juniper-srx/pom.xml | 5 ++--- plugins/network-elements/netscaler/pom.xml | 5 ++--- plugins/network-elements/nicira-nvp/pom.xml | 5 ++--- plugins/network-elements/ovs/pom.xml | 5 ++--- plugins/pom.xml | 5 ++--- plugins/storage-allocators/random/pom.xml | 5 ++--- plugins/user-authenticators/ldap/pom.xml | 5 ++--- plugins/user-authenticators/md5/pom.xml | 5 ++--- plugins/user-authenticators/plain-text/pom.xml | 5 ++--- pom.xml | 5 ++--- server/pom.xml | 5 ++--- test/pom.xml | 5 ++--- usage/pom.xml | 5 ++--- utils/pom.xml | 5 ++--- 34 files changed, 76 insertions(+), 110 deletions(-) diff --git a/agent/pom.xml b/agent/pom.xml index a5595805042..458d97ce4df 100644 --- a/agent/pom.xml +++ b/agent/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-agent Apache CloudStack Agents org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/api/pom.xml b/api/pom.xml index db147758ff3..f25a6bcbf74 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-api Apache CloudStack API org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/awsapi/pom.xml b/awsapi/pom.xml index 9654c2e73dd..f7db10addf2 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -16,16 +16,15 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-awsapi - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT Apache CloudStack AWS API Bridge org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -321,7 +320,7 @@ - + diff --git a/client/pom.xml b/client/pom.xml index 50b85e956f8..3929894d560 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-client-ui Apache CloudStack Client UI @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -152,15 +151,15 @@ - - + + - + - + @@ -204,7 +203,7 @@ - + diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index 8bfb75363f5..b69725f1543 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-console-proxy Apache CloudStack Console Proxy org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 510cb04105e..23bbee56dd4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-core Apache CloudStack Core org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/deps/XenServerJava/pom.xml b/deps/XenServerJava/pom.xml index 13375144534..18ba54f56a3 100644 --- a/deps/XenServerJava/pom.xml +++ b/deps/XenServerJava/pom.xml @@ -16,13 +16,12 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml xapi diff --git a/deps/pom.xml b/deps/pom.xml index ffc0e75ac14..38bb17108c0 100644 --- a/deps/pom.xml +++ b/deps/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-deps Apache CloudStack Dependencies @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -176,7 +175,7 @@ - + diff --git a/developer/pom.xml b/developer/pom.xml index 25e56e0b8b4..f0742e4fbc4 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -8,8 +8,7 @@ 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. --> - + 4.0.0 org.apache.cloudstack cloud-developer @@ -18,7 +17,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/patches/pom.xml b/patches/pom.xml index d62fc860185..d8267619153 100644 --- a/patches/pom.xml +++ b/patches/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-patches Apache CloudStack SystemVM Patches org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml index ca2fae143ab..78829356170 100644 --- a/plugins/deployment-planners/user-concentrated-pod/pom.xml +++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-planner-user-concentrated-pod Apache CloudStack Plugin - User Concentrated Pod Deployment Planner org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml index 6e1ffc6f026..33f6582e72f 100644 --- a/plugins/deployment-planners/user-dispersing/pom.xml +++ b/plugins/deployment-planners/user-dispersing/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-planner-user-dispersing Apache CloudStack Plugin - User Dispersing Deployment Planner org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml index f10e5a4a499..d2fdda8e8ff 100644 --- a/plugins/file-systems/netapp/pom.xml +++ b/plugins/file-systems/netapp/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-netapp Apache CloudStack Plugin - NetApp File System org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml index ad66c0e0af0..ba7e1ae1e65 100644 --- a/plugins/host-allocators/random/pom.xml +++ b/plugins/host-allocators/random/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-host-allocator-random Apache CloudStack Plugin - Host Allocator Random org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 48630856769..a192e780c28 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-kvm Apache CloudStack Plugin - Hypervisor KVM org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml index a8b23d0b943..cf52a196584 100644 --- a/plugins/hypervisors/ovm/pom.xml +++ b/plugins/hypervisors/ovm/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-ovm Apache CloudStack Plugin - Hypervisor OracleVM org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 435ae38b847..22478c4edaa 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-vmware Apache CloudStack Plugin - Hypervisor VMware org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/hypervisors/xen/pom.xml b/plugins/hypervisors/xen/pom.xml index bf38e47adfa..8ebe0304042 100644 --- a/plugins/hypervisors/xen/pom.xml +++ b/plugins/hypervisors/xen/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-hypervisor-xen Apache CloudStack Plugin - Hypervisor Xen org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml index c1ab2c56664..dac500d8fd2 100644 --- a/plugins/network-elements/elastic-loadbalancer/pom.xml +++ b/plugins/network-elements/elastic-loadbalancer/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-elb Apache CloudStack Plugin - Network Elastic Load Balancer org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml index 0cba48cdfcf..bf40332cfbb 100644 --- a/plugins/network-elements/f5/pom.xml +++ b/plugins/network-elements/f5/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-f5 Apache CloudStack Plugin - F5 org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml index 38a2b550c7e..6040720da6e 100644 --- a/plugins/network-elements/juniper-srx/pom.xml +++ b/plugins/network-elements/juniper-srx/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-srx Apache CloudStack Plugin - Juniper SRX org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 377e6e0f228..b11009d8b1a 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-netscaler Apache CloudStack Plugin - Network Netscaler org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml index 37c3a3a6ecd..70f85607e4a 100644 --- a/plugins/network-elements/nicira-nvp/pom.xml +++ b/plugins/network-elements/nicira-nvp/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-nvp Apache CloudStack Plugin - Network Nicira NVP org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml index 02d455c2b54..ab7ffab8465 100644 --- a/plugins/network-elements/ovs/pom.xml +++ b/plugins/network-elements/ovs/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-network-ovs Apache CloudStack Plugin - Open vSwitch org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/pom.xml b/plugins/pom.xml index 206d4a1c1aa..ffd1fe90d2f 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloudstack-plugins Apache CloudStack Plugin POM @@ -25,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT install diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml index 6cb60cdf7ff..b476d1de49f 100644 --- a/plugins/storage-allocators/random/pom.xml +++ b/plugins/storage-allocators/random/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-storage-allocator-random Apache CloudStack Plugin - Storage Allocator Random org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index 7facc3f3307..05e9466d825 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-ldap Apache CloudStack Plugin - User Authenticator LDAP org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml index 1dac92d7e3f..f358f8f1c21 100644 --- a/plugins/user-authenticators/md5/pom.xml +++ b/plugins/user-authenticators/md5/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-md5 Apache CloudStack Plugin - User Authenticator MD5 org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml index a4280a37d26..6406fa92489 100644 --- a/plugins/user-authenticators/plain-text/pom.xml +++ b/plugins/user-authenticators/plain-text/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-plugin-user-authenticator-plaintext Apache CloudStack Plugin - User Authenticator Plain Text org.apache.cloudstack cloudstack-plugins - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 93621dd0994..67efdc2232c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,7 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 @@ -28,7 +27,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT pom Apache CloudStack CloudStack is an IaaS (“Infrastracture as a Service”) cloud orchestration platform. diff --git a/server/pom.xml b/server/pom.xml index f7178d8eb0a..4d38fb317a9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-server Apache CloudStack Server org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/test/pom.xml b/test/pom.xml index f70a89f825a..4507e8cc916 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-testclient Apache CloudStack Test org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/usage/pom.xml b/usage/pom.xml index 92e5e728f1a..258bf847168 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-usage Apache CloudStack Usage Server org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT diff --git a/utils/pom.xml b/utils/pom.xml index e8d7827a7fd..8309a6433c1 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -16,15 +16,14 @@ specific language governing permissions and limitations under the License. --> - + 4.0.0 cloud-utils Apache CloudStack Utils org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT From 4d458c988aa174adc81ed143be7631b2fffa4044 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 2 Oct 2012 00:12:51 +0530 Subject: [PATCH 08/45] CloudStack-222:Admin UI prompts to restart Management server with cancel edit operation - Widget changes to reset the default value Reviewed-By:Brian --- ui/scripts/ui/widgets/listView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js index 5cc069df56a..425efceb19f 100644 --- a/ui/scripts/ui/widgets/listView.js +++ b/ui/scripts/ui/widgets/listView.js @@ -469,9 +469,11 @@ if (args.cancel) { //click Cancel button // showLabel(); + var oldVal = $label.html(); $edit.hide(); $label.fadeIn(); $instanceRow.closest('div.data-table').dataTable('refresh'); + $editInput.val(_s(oldVal)); return false; } From ac31b7d9142601de213548ff8b47f09a8e1f45ee Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 26 Jul 2012 16:01:05 -0700 Subject: [PATCH 09/45] CS-15687: cloudstack 3.0 UI - zone wizard - change timer setting for adding netcaler provider. --- ui/scripts/zoneWizard.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 8414048ab74..46ed749cbbd 100644 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -2161,10 +2161,10 @@ var errorMsg = parseXMLHttpResponse(XMLHttpResponse); alert("addNetworkServiceProvider&name=Netscaler failed. Error: " + errorMsg); } - }); - }, 3000); - } - }); + }); + }, 3000); + } + }); //add netscaler provider (end) } else { //selectedNetworkOfferingHavingNetscaler == false From 90fd0793feb124623817e896b883709c610ed40c Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 1 Oct 2012 16:40:00 -0400 Subject: [PATCH 10/45] Modified devcloud build process to include maven3 install and steps. --- .../puppet-devcloud/files/builddevcloud.sh | 6 +++++ .../puppet-devcloud/files/installmaven.sh | 22 +++++++++++++++++++ .../puppet-devcloud/manifests/init.pp | 17 ++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh index 7755766ec3f..03bd854e015 100644 --- a/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh +++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/builddevcloud.sh @@ -18,5 +18,11 @@ # under the License. export CATALINA_HOME=/opt/cloudstack/apache-tomcat-6.0.32 +export M2_HOME=/opt/cloudstack/apache-maven-3.0.4 +export M2=$M2_HOME/bin +MAVEN_OPTS="-Xms256m -Xmx512m" +PATH=$M2:$PATH cd /opt/cloudstack/incubator-cloudstack/ +/usr/bin/mvn -P deps +/usr/bin/mvn clean /usr/bin/ant clean-all build-all deploy-server deploydb diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh b/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh new file mode 100644 index 00000000000..48ffdfe8de7 --- /dev/null +++ b/tools/devcloud/devcloudbox/puppet-devcloud/files/installmaven.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# 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. + +cd /opt/cloudstack +/usr/bin/wget http://apache.mirrors.pair.com/maven/maven-3/3.0.4/binaries/apache-maven-3.0.4-bin.tar.gz +/bin/tar xvfz apache-maven-3.0.4-bin.tar.gz diff --git a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp index 5547ed3fefa..3dc74a18206 100644 --- a/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp +++ b/tools/devcloud/devcloudbox/puppet-devcloud/manifests/init.pp @@ -297,9 +297,26 @@ class puppet-devcloud { group => '0', } + file { '/opt/cloudstack/installmaven.sh': + ensure => 'file', + source => 'puppet:///modules/puppet-devcloud/installmaven.sh', + mode => '777', + owner => '0', + group => '0', + } + + exec { "install_maven": + require => File['/opt/cloudstack/installmaven.sh'], + command => '/opt/cloudstack/installmaven.sh', + cwd => '/opt/cloudstack', + creates => '/opt/cloudstack/apache-maven-3.0.4/', + timeout => '0', + } + exec { "build_cloudstack": require => [ Package['ant'], + Exec['install_maven'], Exec["catalina_home"], File['/opt/cloudstack/incubator-cloudstack/dist'], File['/opt/cloudstack/incubator-cloudstack/target'], From 93aaa5f97519a848bcd035e01343b4760812d0d7 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 1 Oct 2012 14:07:24 -0700 Subject: [PATCH 11/45] Provide an (for now) empty upgrade path so the server will start. --- .../cloud/upgrade/DatabaseUpgradeChecker.java | 3 + .../com/cloud/upgrade/dao/Upgrade40to41.java | 69 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 server/src/com/cloud/upgrade/dao/Upgrade40to41.java diff --git a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 047bb3eec21..a84e6dbb081 100755 --- a/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -55,6 +55,7 @@ import com.cloud.upgrade.dao.Upgrade229to2210; import com.cloud.upgrade.dao.Upgrade301to302; import com.cloud.upgrade.dao.Upgrade302to40; import com.cloud.upgrade.dao.Upgrade30to301; +import com.cloud.upgrade.dao.Upgrade40to41; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; import com.cloud.upgrade.dao.VersionDao; @@ -157,6 +158,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40() }); _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40() }); + + _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41() }); } protected void runScript(Connection conn, File file) { diff --git a/server/src/com/cloud/upgrade/dao/Upgrade40to41.java b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java new file mode 100644 index 00000000000..58130ab075f --- /dev/null +++ b/server/src/com/cloud/upgrade/dao/Upgrade40to41.java @@ -0,0 +1,69 @@ +/** + * + */ +package com.cloud.upgrade.dao; + +import java.io.File; +import java.sql.Connection; + +/** + * @author htrippaers + * + */ +public class Upgrade40to41 extends Upgrade30xBase implements DbUpgrade { + + /** + * + */ + public Upgrade40to41() { + // TODO Auto-generated constructor stub + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradableVersionRange() + */ + @Override + public String[] getUpgradableVersionRange() { + return new String[] { "4.0.0", "4.1.0" }; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getUpgradedVersion() + */ + @Override + public String getUpgradedVersion() { + return "4.1.0"; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#supportsRollingUpgrade() + */ + @Override + public boolean supportsRollingUpgrade() { + return false; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getPrepareScripts() + */ + @Override + public File[] getPrepareScripts() { + return new File[0]; + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#performDataMigration(java.sql.Connection) + */ + @Override + public void performDataMigration(Connection conn) { + } + + /* (non-Javadoc) + * @see com.cloud.upgrade.dao.DbUpgrade#getCleanupScripts() + */ + @Override + public File[] getCleanupScripts() { + return new File[0]; + } + +} From 011281f93d89eadb91c93351f25c33bb597da9e0 Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 1 Oct 2012 15:03:15 -0700 Subject: [PATCH 12/45] Move vmware specific tests from core to vmware-base --- .../hypervisor/vmware/mo/TestVmwareContextFactory.java | 0 .../test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java | 6 +++--- .../com/cloud/hypervisor/vmware/util/TestVmwareUtil.java | 0 {core => vmware-base}/test/com/cloud/vmware/TestVMWare.java | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename {core => vmware-base}/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java (100%) rename {core => vmware-base}/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java (99%) rename {core => vmware-base}/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java (100%) rename {core => vmware-base}/test/com/cloud/vmware/TestVMWare.java (100%) diff --git a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java similarity index 100% rename from core/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java rename to vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareContextFactory.java diff --git a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java similarity index 99% rename from core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java rename to vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java index 2f239da46a3..2417ddf99de 100644 --- a/core/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java +++ b/vmware-base/test/com/cloud/hypervisor/vmware/mo/TestVmwareMO.java @@ -18,13 +18,13 @@ package com.cloud.hypervisor.vmware.mo; import java.util.GregorianCalendar; -import org.apache.log4j.Logger; - +import org.apache.log4j.Logger; + import com.cloud.hypervisor.vmware.mo.SnapshotDescriptor.SnapshotInfo; import com.cloud.hypervisor.vmware.util.VmwareContext; import com.cloud.serializer.GsonHelper; import com.cloud.utils.Pair; -import com.cloud.utils.testcase.Log4jEnabledTestCase; +import com.cloud.utils.testcase.Log4jEnabledTestCase; import com.google.gson.Gson; import com.vmware.vim25.DynamicProperty; import com.vmware.vim25.ManagedObjectReference; diff --git a/core/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java b/vmware-base/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java similarity index 100% rename from core/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java rename to vmware-base/test/com/cloud/hypervisor/vmware/util/TestVmwareUtil.java diff --git a/core/test/com/cloud/vmware/TestVMWare.java b/vmware-base/test/com/cloud/vmware/TestVMWare.java similarity index 100% rename from core/test/com/cloud/vmware/TestVMWare.java rename to vmware-base/test/com/cloud/vmware/TestVMWare.java From f16b5103d8c5737d88e126f59283944521ff2baf Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Mon, 1 Oct 2012 15:04:08 -0700 Subject: [PATCH 13/45] Merge some stuff from maven-waf branch into master --- awsapi/pom.xml | 1 + client/pom.xml | 82 +++++++++++++++++++++++++++++++++++++++++++ console-proxy/pom.xml | 23 +++++++++--- core/pom.xml | 2 +- plugins/pom.xml | 1 + pom.xml | 20 +++++++---- server/pom.xml | 26 +++++++++++++- usage/pom.xml | 1 + utils/pom.xml | 24 +++++++++++++ vmware-base/pom.xml | 5 ++- 10 files changed, 172 insertions(+), 13 deletions(-) diff --git a/awsapi/pom.xml b/awsapi/pom.xml index f7db10addf2..5a6fd672d8f 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -343,4 +343,5 @@ + war diff --git a/client/pom.xml b/client/pom.xml index 3929894d560..0a138764419 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -213,4 +213,86 @@ + + + netapp + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-netapp + ${project.version} + + + + + f5 + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-network-f5 + ${project.version} + + + + + netscaler + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-network-netscaler + ${project.version} + + + + + srx + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-network-srx + ${project.version} + + + + + vmware + + + nonoss + + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + + diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index b69725f1543..a7fd1e52546 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -137,7 +137,19 @@ - - - + + + + + + diff --git a/core/pom.xml b/core/pom.xml index 23bbee56dd4..ac45233d88d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -57,6 +57,6 @@ install src - + test diff --git a/plugins/pom.xml b/plugins/pom.xml index ffd1fe90d2f..dbdea24e17b 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -29,6 +29,7 @@ install src + test deployment-planners/user-concentrated-pod diff --git a/pom.xml b/pom.xml index 67efdc2232c..1c553d1557c 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,7 @@ plugins awsapi patches + client test @@ -312,12 +313,7 @@ - - client - - client - - + deps @@ -330,6 +326,18 @@ developer + + vmware + + + nonoss + + + + vmware-base + + + diff --git a/server/pom.xml b/server/pom.xml index 4d38fb317a9..29922b62cb5 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -63,10 +63,34 @@ jstl ${cs.jstl.version} + + org.apache.cloudstack + cloud-utils + ${project.version} + tests + test + + install src - + test + + + test/resources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + com/cloud/upgrade/* + + + + diff --git a/usage/pom.xml b/usage/pom.xml index 258bf847168..252e293b4e0 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -35,5 +35,6 @@ install src + test diff --git a/utils/pom.xml b/utils/pom.xml index 8309a6433c1..47e20eda59c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -123,11 +123,26 @@ commons-configuration ${cs.configuration.version} + + + mysql + mysql-connector-java + 5.1.21 + test + install src test + + + test/resources + + + conf + + org.apache.maven.plugins @@ -140,6 +155,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + com/cloud/utils/testcase/*TestCase* + + + diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 1dabe83841e..32f9d3fb105 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -24,7 +24,7 @@ org.apache.cloudstack cloudstack - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT @@ -41,16 +41,19 @@ com.cloud.com.vmware vmware-vim 1.0 + provided com.cloud.com.vmware vmware-vim25 1.0 + provided com.cloud.com.vmware vmware-apputils 1.0 + provided org.apache.axis From 2c6bc0e9185f6226ea757cbec01b4c9fae8adbbe Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 1 Oct 2012 16:05:19 -0700 Subject: [PATCH 14/45] CS-16197: cloudstack UI - Tags - input validation. --- ui/scripts/ui/widgets/tagger.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js index f996f33d349..0f297eb8f7c 100644 --- a/ui/scripts/ui/widgets/tagger.js +++ b/ui/scripts/ui/widgets/tagger.js @@ -21,11 +21,13 @@ var value = $form.find('input[name=value]').val(); if (!key || !value) { - cloudStack.dialog.notice({ message: 'Please specify a tag key and value' }); - + cloudStack.dialog.notice({ message: 'Please specify a tag key and value' }); return false; } - + + if($form.find('div.field.key').find('label.error').css('display') == 'block' || $form.find('div.field.value').find('label.error').css('display') == 'block') + return false; + return true; }; @@ -34,10 +36,10 @@ var $form = $('
').addClass('tag-input'); var $keyField = $('
').addClass('field key'); var $keyLabel = $('