[2/2] git commit: updated refs/heads/4.4 to 4c82594
Merge branch 'hotfix/4.4-readme' into 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4c825941 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4c825941 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4c825941 Branch: refs/heads/4.4 Commit: 4c825941457f1418d86541c016ccc28a9ad21b23 Parents: 7f34334 7e0697d Author: Daan Hoogland Authored: Wed Aug 6 07:49:32 2014 +0200 Committer: Daan Hoogland Committed: Wed Aug 6 07:49:32 2014 +0200 -- README.md | 62 -- 1 file changed, 60 insertions(+), 2 deletions(-) --
[1/2] git commit: updated refs/heads/4.4 to 4c82594
Repository: cloudstack Updated Branches: refs/heads/4.4 7f343344a -> 4c8259414 README: some sections from the prior version copied back in. see commit 3433eb7c093289ae81e99a3bdf8fe3038aa752a3 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e0697d8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e0697d8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e0697d8 Branch: refs/heads/4.4 Commit: 7e0697d8358f7ef910c893028dd9f6d17943e78a Parents: 881275c Author: Daan Hoogland Authored: Wed Aug 6 07:48:33 2014 +0200 Committer: Daan Hoogland Committed: Wed Aug 6 07:48:33 2014 +0200 -- README.md | 62 -- 1 file changed, 60 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e0697d8/README.md -- diff --git a/README.md b/README.md index 657b948..cce22ae 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,57 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. +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. + +Please see the [LICENSE](LICENSE) file included in the root directory +of the source tree for extended license details. + +## Notice of Cryptographic Software + +This distribution includes cryptographic software. The country in which you currently +reside may have restrictions on the import, possession, use, and/or re-export to another +country, of encryption software. BEFORE using any encryption software, please check your +country's laws, regulations and policies concerning the import, possession, or use, and +re-export of encryption software, to see if this is permitted. See http://www.wassenaar.org/ +for more information. + +The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has +classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which +includes information security software using or performing cryptographic functions with +asymmetric algorithms. The form and manner of this Apache Software Foundation distribution +makes it eligible for export under the License Exception ENC Technology Software +Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section +740.13) for both object code and source code. + +The following provides more details on the included cryptographic software: + + CloudStack makes use of JaSypt cryptographic libraries + + CloudStack has a system requirement of MySQL, and uses native database encryption + functionality. + + CloudStack makes use of the Bouncy Castle general-purpose encryption library. + + CloudStack can optionally interacts with and controls OpenSwan-based VPNs. + + CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation. + + CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation. ## Downloading @@ -97,6 +147,13 @@ several communications channels, the mailing lists are the most active and the official channels for making decisions about the project itself. Mailing lists: +- [Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org) +- [Users Mailing List](mailto:users-subscr...@cloudstack.apache.org) +- [Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org) +- [Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org) +- [Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org) + +For more details on mailing lists subscription and usage, please visit: http://cloudstack.apache.org/mailing-lists.html IRC, join us on irc.freenode.net on: @@ -110,7 +167,7 @@ https://issues.apache.org/jira/browse/CLOUDSTACK Developer resources: http://cloudstack.apache.org/developers.html -For more details please see our contributing page: +Please see our contributing page for more details: http://cloudstack.apache.org/contribute.htm
git commit: updated refs/heads/hotfix/4.4-readme to 7e0697d
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4-readme 881275c16 -> 7e0697d83 README: some sections from the prior version copied back in. see commit 3433eb7c093289ae81e99a3bdf8fe3038aa752a3 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e0697d8 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e0697d8 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e0697d8 Branch: refs/heads/hotfix/4.4-readme Commit: 7e0697d8358f7ef910c893028dd9f6d17943e78a Parents: 881275c Author: Daan Hoogland Authored: Wed Aug 6 07:48:33 2014 +0200 Committer: Daan Hoogland Committed: Wed Aug 6 07:48:33 2014 +0200 -- README.md | 62 -- 1 file changed, 60 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e0697d8/README.md -- diff --git a/README.md b/README.md index 657b948..cce22ae 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,57 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. +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. + +Please see the [LICENSE](LICENSE) file included in the root directory +of the source tree for extended license details. + +## Notice of Cryptographic Software + +This distribution includes cryptographic software. The country in which you currently +reside may have restrictions on the import, possession, use, and/or re-export to another +country, of encryption software. BEFORE using any encryption software, please check your +country's laws, regulations and policies concerning the import, possession, or use, and +re-export of encryption software, to see if this is permitted. See http://www.wassenaar.org/ +for more information. + +The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has +classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which +includes information security software using or performing cryptographic functions with +asymmetric algorithms. The form and manner of this Apache Software Foundation distribution +makes it eligible for export under the License Exception ENC Technology Software +Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section +740.13) for both object code and source code. + +The following provides more details on the included cryptographic software: + + CloudStack makes use of JaSypt cryptographic libraries + + CloudStack has a system requirement of MySQL, and uses native database encryption + functionality. + + CloudStack makes use of the Bouncy Castle general-purpose encryption library. + + CloudStack can optionally interacts with and controls OpenSwan-based VPNs. + + CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation. + + CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation. ## Downloading @@ -97,6 +147,13 @@ several communications channels, the mailing lists are the most active and the official channels for making decisions about the project itself. Mailing lists: +- [Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org) +- [Users Mailing List](mailto:users-subscr...@cloudstack.apache.org) +- [Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org) +- [Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org) +- [Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org) + +For more details on mailing lists subscription and usage, please visit: http://cloudstack.apache.org/mailing-lists.html IRC, join us on irc.freenode.net on: @@ -110,7 +167,7 @@ https://issues.apache.org/jira/browse/CLOUDSTACK Developer resources: http://cloudstack.apache.org/developers.html -For more details please see our contributing page: +Please see our contributing page for more details: http://cloudsta
[2/3] git commit: updated refs/heads/4.4 to 7f34334
remove update to 4.3 templates for 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21a6a699
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21a6a699
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21a6a699
Branch: refs/heads/4.4
Commit: 21a6a6993e1ac73a1f4e790e0b004377f5ffd708
Parents: 00c2696
Author: Daan Hoogland
Authored: Tue Aug 5 17:48:58 2014 +0200
Committer: Daan Hoogland
Committed: Tue Aug 5 17:48:58 2014 +0200
--
.../com/cloud/upgrade/dao/Upgrade421to430.java | 158 ---
1 file changed, 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21a6a699/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index 50822a3..1ab462a 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -24,15 +24,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -70,7 +65,6 @@ public class Upgrade421to430 implements DbUpgrade {
encryptLdapConfigParams(conn);
encryptImageStoreDetails(conn);
upgradeMemoryOfSsvmOffering(conn);
-updateSystemVmTemplates(conn);
}
private void upgradeMemoryOfSsvmOffering(Connection conn) {
@@ -195,158 +189,6 @@ public class Upgrade421to430 implements DbUpgrade {
}
-private void updateSystemVmTemplates(Connection conn) {
-s_logger.debug("Updating System Vm template IDs");
-try{
-//Get all hypervisors in use
-Set hypervisorsListInUse = new
HashSet();
-try(PreparedStatement pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-ResultSet rs = pstmt.executeQuery();
-) {
-while(rs.next()){
-switch
(Hypervisor.HypervisorType.getType(rs.getString(1))) {
-case XenServer:
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
-break;
-case KVM:
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
-break;
-case VMware:
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
-break;
-case Hyperv:
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
-break;
-case LXC:
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
-break;
-}
-}
-} catch (Exception e) {
-
s_logger.error("updateSystemVmTemplates:Exception:"+e.getMessage());
-throw new
CloudRuntimeException("updateSystemVmTemplates:Exception:"+e.getMessage(), e);
-}
-
-Map NewTemplateNameList = new
HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.3");
-put(Hypervisor.HypervisorType.VMware,
"systemvm-vmware-4.3");
-put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.3");
-put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.3");
-put(Hypervisor.HypervisorType.Hyperv,
"systemvm-hyperv-4.3");
-}
-};
-
-Map
routerTemplateConfigurationNames = new HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer,
"router.template.xen");
-put(Hypervisor.HypervisorType.VMware,
"router.template.vmware");
-put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
-put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
-put(Hypervisor.HypervisorType.Hyperv,
"router.template.hyperv");
-}
-};
-
-Map newTemplateUrl = new
HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer,
"http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2";);
-put
[3/3] git commit: updated refs/heads/4.4 to 7f34334
Merge remote-tracking branch 'origin/hotfix/4.4-svm-upgrade' into 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f343344 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f343344 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f343344 Branch: refs/heads/4.4 Commit: 7f343344a117ff54ee120a1ee37fd4c9b90f83bd Parents: 89041d2 21a6a69 Author: Daan Hoogland Authored: Wed Aug 6 07:38:00 2014 +0200 Committer: Daan Hoogland Committed: Wed Aug 6 07:38:00 2014 +0200 -- .../com/cloud/upgrade/dao/Upgrade421to430.java | 158 -- .../com/cloud/upgrade/dao/Upgrade440to441.java | 167 +++ 2 files changed, 167 insertions(+), 158 deletions(-) --
[1/3] git commit: updated refs/heads/4.4 to 7f34334
Repository: cloudstack
Updated Branches:
refs/heads/4.4 89041d235 -> 7f343344a
upgrade of systemvm templates
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00c2696e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00c2696e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00c2696e
Branch: refs/heads/4.4
Commit: 00c2696e7a1d1930a4088af6fc085b523b0b3589
Parents: 8608321
Author: Daan Hoogland
Authored: Mon Aug 4 14:12:58 2014 +0200
Committer: Daan Hoogland
Committed: Mon Aug 4 14:12:58 2014 +0200
--
.../com/cloud/upgrade/dao/Upgrade440to441.java | 167 +++
1 file changed, 167 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00c2696e/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
index 497da8d..f06ceb9 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
@@ -19,9 +19,17 @@ package com.cloud.upgrade.dao;
import java.io.File;
import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -55,6 +63,165 @@ public class Upgrade440to441 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
+updateSystemVmTemplates(conn);
+}
+
+@SuppressWarnings("serial")
+private void updateSystemVmTemplates(Connection conn) {
+s_logger.debug("Updating System Vm template IDs");
+//Get all hypervisors in use
+Set hypervisorsListInUse = new
HashSet();
+try(PreparedStatement pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
+ResultSet rs = pstmt.executeQuery();
+ ) {
+while(rs.next()){
+switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+case XenServer:
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+break;
+case KVM:
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+break;
+case VMware:
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+break;
+case Hyperv:
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+break;
+case LXC:
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+break;
+default: // we don't support system vms on other hypervisors
(yet)
+break;
+}
+}
+} catch (SQLException e) {
+s_logger.error("updateSystemVmTemplates:Exception while getting
hypervisor types from clusters: "+e.getMessage());
+throw new CloudRuntimeException("updateSystemVmTemplates:Exception
while getting hypervisor types from clusters", e);
+}
+
+Map NewTemplateNameList = new
HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.4");
+put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.4");
+put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.4");
+put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.4");
+put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.4");
+}
+};
+
+Map
routerTemplateConfigurationNames = new HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"router.template.xen");
+put(Hypervisor.HypervisorType.VMware,
"router.template.vmware");
+put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+put(Hypervisor.HypervisorType.Hyperv,
"router.template.hyperv");
+}
+};
+
+Map newTemplateUrl = new
HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-xen.vhd.bz2";);
+put(Hypervisor.HypervisorType.VMware,
"http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-vmware.ova
[2/2] git commit: updated refs/heads/4.4 to 89041d2
Merge remote-tracking branch 'origin/hotfix/4.4-7257' into 4.4 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/89041d23 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/89041d23 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/89041d23 Branch: refs/heads/4.4 Commit: 89041d2351b30641d5d674950cf27d55a2cd4851 Parents: 881275c e73e7c3 Author: Daan Hoogland Authored: Wed Aug 6 07:36:01 2014 +0200 Committer: Daan Hoogland Committed: Wed Aug 6 07:36:01 2014 +0200 -- setup/db/db/schema-440to441.sql | 146 +++ 1 file changed, 146 insertions(+) --
[1/2] git commit: updated refs/heads/4.4 to 89041d2
Repository: cloudstack Updated Branches: refs/heads/4.4 881275c16 -> 89041d235 CLOUDSTACK-7257: Missing LXC mappings, reuse KVM mappings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e73e7c39 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e73e7c39 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e73e7c39 Branch: refs/heads/4.4 Commit: e73e7c3939b0d5f427521df982c7b0c46bae3e0a Parents: 9315321 Author: amoghvk Authored: Mon Aug 4 14:42:58 2014 -0700 Committer: amoghvk Committed: Tue Aug 5 09:38:57 2014 -0700 -- setup/db/db/schema-440to441.sql | 146 +++ 1 file changed, 146 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e73e7c39/setup/db/db/schema-440to441.sql -- diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql index df12ea4..4460559 100644 --- a/setup/db/db/schema-440to441.sql +++ b/setup/db/db/schema-440to441.sql @@ -21,3 +21,149 @@ -- Disable foreign key checking SET foreign_key_checks = 0; +-- Add missing LXC mappings +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.5', 1, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.6', 2, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.7', 3, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.8', 4, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 5, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 6, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 7, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 8, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 9, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 10, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 11, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 12, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 13, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 14, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 111, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 112, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'Red Hat Enterprise Linux 4.5', 26, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_
[2/2] git commit: updated refs/heads/4.4 to 881275c
README: Fix links for viewing on Github Signed-off-by: Rohit Yadav (cherry picked from commit fc7b2baba33ee990c5edc70503d01acf55e6a973) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/881275c1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/881275c1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/881275c1 Branch: refs/heads/4.4 Commit: 881275c16ce884e806423473fb6316746149986d Parents: 7e9269e Author: Rohit Yadav Authored: Tue Aug 5 16:02:44 2014 +0200 Committer: Daan Hoogland Committed: Tue Aug 5 17:31:53 2014 +0200 -- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/881275c1/README.md -- diff --git a/README.md b/README.md index 600f783..657b948 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the LICENSE file included in the root directory of the source tree. +Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. ## Downloading @@ -54,11 +54,11 @@ You can download released versions from: http://cloudstack.apache.org/downloads. ## Building -Please see the INSTALL.md file included in the root directory of the source tree. +Please see the [INSTALL.md](INSTALL.md) file included in the root directory of the source tree. -### Tooling +## Tooling -Please see the README.tools.md file included in the root directory of the source tree. +Please see the [README.tools.md](README.tools.md) file included in the root directory of the source tree. ## Documentation @@ -77,7 +77,7 @@ http://docs.cloudstack.apache.org/projects/cloudstack-administration Latest release notes: http://docs.cloudstack.apache.org/projects/cloudstack-release-notes -Design documents:: +Design documents: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design API documentation: @@ -113,7 +113,7 @@ http://cloudstack.apache.org/developers.html For more details please see our contributing page: http://cloudstack.apache.org/contribute.html -### News and Events +## News and Events Blog: https://blogs.apache.org/cloudstack @@ -127,7 +127,7 @@ http://planet.apache.org/cloudstack Events and meetup: http://lanyrd.com/topics/apache-cloudstack -### Reporting Security Vulnerabilities +## Reporting Security Vulnerabilities If you've found an issue that you believe is a security vulnerability in a released version of CloudStack, please report it to
[1/2] git commit: updated refs/heads/4.4 to 881275c
Repository: cloudstack Updated Branches: refs/heads/4.4 9315321da -> 881275c16 README: Give CloudStack its much deserved readme file Signed-off-by: Rohit Yadav (cherry picked from commit d753e765f7ca848e4cc79d25ba5fa986b8b63522) Conflicts: README.md Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e9269eb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e9269eb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e9269eb Branch: refs/heads/4.4 Commit: 7e9269eb2d9792834d7175184e58a901bec18039 Parents: 9315321 Author: Rohit Yadav Authored: Tue Aug 5 15:54:40 2014 +0200 Committer: Daan Hoogland Committed: Tue Aug 5 17:31:08 2014 +0200 -- README.md | 175 + pom.xml | 1 + 2 files changed, 115 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e9269eb/README.md -- diff --git a/README.md b/README.md index 009df83..600f783 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,137 @@ -Apache CloudStack Version 4.4.1 +# Apache CloudStack -# About Apache CloudStack +Apache CloudStack is open source software designed to deploy and manage large +networks of virtual machines, as a highly available, highly scalable +Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used +by a number of service providers to offer public cloud services, and by many +companies to provide an on-premises (private) cloud offering, or as part of a +hybrid cloud solution. -Apache CloudStack is software designed to deploy -and manage large networks of virtual machines, as a highly -available, highly scalable Infrastructure as a Service (IaaS) -cloud computing platform. CloudStack is used by a number of -service providers to offer public cloud services, and by many -companies to provide an on-premises (private) cloud offering. +CloudStack is a turnkey solution that includes the entire "stack" of features +most organizations want with an IaaS cloud: compute orchestration, +Network-as-a-Service, user and account management, a full and open native API, +resource accounting, and a first-class User Interface (UI). -Apache CloudStack currently supports the most popular hypervisors: -VMware, Oracle VM, KVM, XenServer and Xen Cloud Platform. -CloudStack also offers bare metal management of servers, -using PXE to provision OS images and IPMI to manage the server. -Apache CloudStack offers three methods for managing cloud -computing environments: an easy to use Web interface, command -line tools, and a full-featured RESTful API. +CloudStack currently supports the most popular hypervisors: +VMware, KVM, XenServer, Xen Cloud Platform (XCP) and Hyper-V. -Visit us at [Apache CloudStack](http://cloudstack.apache.org). +Users can manage their cloud with an easy to use Web interface, command line +tools, and/or a full-featured RESTful API. In addition, CloudStack provides an +API that's compatible with AWS EC2 and S3 for organizations that wish to deploy +hybrid clouds. -## Mailing lists -[Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org) -[Users Mailing List](mailto:users-subscr...@cloudstack.apache.org) -[Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org) -[Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org) -[Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org) +For more information on Apache CloudStack, please visit: +http://cloudstack.apache.org -# License +## Who Uses CloudStack? -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 +There are more than 150 known organisations using Apache CloudStack (or a +commercial distribution of CloudStack). Our users include many major service +providers running CloudStack to offer public cloud services, product vendors who +incorporate or integrate with Cloudstack in their own products, organisations +who have used Cloudstack to build their own private clouds, and systems +integrators that offer CloudStack related services. - http://www.apache.org/licenses/LICENSE-2.0 +For case studies highlighting successful deployments of Apache CloudStack, please +visit: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies -Unless required by applicable law or agreed to in writing, -software distributed under the Licens
git commit: updated refs/heads/master to 0ca3b4a
Repository: cloudstack
Updated Branches:
refs/heads/master 9866c648e -> 0ca3b4a4e
Fixed coverity reported concurrency issue
Signed-off-by: Santhosh Edukulla
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ca3b4a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ca3b4a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ca3b4a4
Branch: refs/heads/master
Commit: 0ca3b4a4e4786676e13ec67c2cbc17b530917765
Parents: 9866c64
Author: Santhosh Edukulla
Authored: Tue Aug 5 17:28:37 2014 +0530
Committer: Santhosh Edukulla
Committed: Wed Aug 6 10:15:39 2014 +0530
--
.../org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ca3b4a4/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java
--
diff --git
a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java
b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java
index 7ccd8bb..a3dea79 100644
---
a/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java
+++
b/framework/ipc/src/org/apache/cloudstack/framework/rpc/RpcClientCallImpl.java
@@ -193,9 +193,8 @@ public class RpcClientCallImpl implements RpcClientCall {
@SuppressWarnings("unchecked")
public void complete(String result) {
-_responseResult = result;
-
synchronized (_responseLock) {
+_responseResult = result;
_responseDone = true;
_responseLock.notifyAll();
}
@@ -213,11 +212,10 @@ public class RpcClientCallImpl implements RpcClientCall {
}
public void complete(RpcException e) {
-_responseResult = e;
synchronized (_responseLock) {
+_responseResult = e;
_responseDone = true;
-
_responseLock.notifyAll();
}
git commit: updated refs/heads/master to 9866c64
Repository: cloudstack
Updated Branches:
refs/heads/master b9d834e83 -> 9866c648e
CLOUDSTACK-7260: Management server not responding after some time for
Vmware due to Oom (cannot create native thread).
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9866c648
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9866c648
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9866c648
Branch: refs/heads/master
Commit: 9866c648eb5e6ce6ded1b6dcadbb77240fe0e683
Parents: b9d834e
Author: Min Chen
Authored: Tue Aug 5 17:26:10 2014 -0700
Committer: Min Chen
Committed: Tue Aug 5 17:36:53 2014 -0700
--
.../vmware/resource/VmwareResource.java | 98 +++-
.../vmware/util/VmwareContextPool.java | 12 +--
2 files changed, 61 insertions(+), 49 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9866c648/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 8a2488d..60007e3 100755
---
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3847,18 +3847,22 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
@Override
public PingCommand getCurrentStatus(long id) {
-gcAndKillHungWorkerVMs();
-VmwareContext context = getServiceContext();
-VmwareHypervisorHost hyperHost = getHyperHost(context);
try {
-if (!hyperHost.isHyperHostConnected()) {
+gcAndKillHungWorkerVMs();
+VmwareContext context = getServiceContext();
+VmwareHypervisorHost hyperHost = getHyperHost(context);
+try {
+if (!hyperHost.isHyperHostConnected()) {
+return null;
+}
+} catch (Exception e) {
+s_logger.error("Unexpected exception", e);
return null;
}
-} catch (Exception e) {
-s_logger.error("Unexpected exception", e);
-return null;
+return new PingRoutingCommand(getType(), id, syncHostVmStates());
+} finally {
+recycleServiceContext();
}
-return new PingRoutingCommand(getType(), id, syncHostVmStates());
}
private void gcAndKillHungWorkerVMs() {
@@ -3926,8 +3930,6 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
s_logger.warn("Encounter remote exception to vCenter,
invalidate VMware session context");
invalidateServiceContext();
}
-} finally {
-recycleServiceContext();
}
}
@@ -4661,37 +4663,32 @@ public class VmwareResource implements
StoragePoolResource, ServerResource, Vmwa
_guestTrafficInfo =
(VmwareTrafficLabel)params.get("guestTrafficInfo");
_publicTrafficInfo =
(VmwareTrafficLabel)params.get("publicTrafficInfo");
VmwareContext context = getServiceContext();
+VmwareManager mgr =
context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
+if (mgr == null) {
+throw new ConfigurationException("Invalid vmwareContext:
vmwareMgr stock object is not set or cleared.");
+}
+mgr.setupResourceStartupParams(params);
-// TODO ??? this is an invalid usage pattern. need to fix the
reference to VolumeManagerImp here at resource file
-// volMgr = ComponentContext.inject(VolumeManagerImpl.class);
-try {
-VmwareManager mgr =
context.getStockObject(VmwareManager.CONTEXT_STOCK_NAME);
-mgr.setupResourceStartupParams(params);
+CustomFieldsManagerMO cfmMo = new CustomFieldsManagerMO(context,
context.getServiceContent().getCustomFieldsManager());
+cfmMo.ensureCustomFieldDef("Datastore",
CustomFieldConstants.CLOUD_UUID);
+if (_publicTrafficInfo != null &&
_publicTrafficInfo.getVirtualSwitchType() !=
VirtualSwitchType.StandardVirtualSwitch || _guestTrafficInfo != null &&
+_guestTrafficInfo.getVirtualSwitchType() !=
VirtualSwitchType.StandardVirtualSwitch) {
+cfmMo.ensureCustomFieldDef("DistributedVirtualPortgroup",
CustomFieldConstants.CLOUD_GC_DVP);
+}
+cfmMo.ensureCustomFieldDef("Network",
CustomFieldConstants.CLOUD_GC);
+
git commit: updated refs/heads/master to b9d834e
Repository: cloudstack
Updated Branches:
refs/heads/master 129437c63 -> b9d834e83
CLOUDSTACK-4200: listSystemVMs API and listRouters API should return hypervisor
property since dynamic scaling is not enabled for all the hypervisors and that
action can be showed only for the hypervisors that support it.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9d834e8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9d834e8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9d834e8
Branch: refs/heads/master
Commit: b9d834e83854009483f6d061f9996e5ffaa9b883
Parents: 129437c
Author: Nitin Mehta
Authored: Tue Aug 5 17:29:34 2014 -0700
Committer: Nitin Mehta
Committed: Tue Aug 5 17:29:34 2014 -0700
--
.../api/response/DomainRouterResponse.java | 12 +++
.../api/response/SystemVmResponse.java | 12 +++
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
.../cloud/api/query/vo/DomainRouterJoinVO.java | 9 ++
setup/db/db/schema-441to450.sql | 104 +++
6 files changed, 139 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d834e8/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
--
diff --git
a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
index ed16020..9225ba0 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
@@ -85,6 +85,10 @@ public class DomainRouterResponse extends BaseResponse
implements ControlledView
@Param(description = "the hostname for the router")
private String hostName;
+@SerializedName("hypervisor")
+@Param(description = "the hypervisor on which the template runs")
+private String hypervisor;
+
@SerializedName(ApiConstants.LINK_LOCAL_IP)
@Param(description = "the link local IP address for the router")
private String linkLocalIp;
@@ -262,6 +266,14 @@ public class DomainRouterResponse extends BaseResponse
implements ControlledView
this.hostName = hostName;
}
+public String getHypervisor() {
+return hypervisor;
+}
+
+public void setHypervisor(String hypervisor) {
+this.hypervisor = hypervisor;
+}
+
public void setPublicIp(String publicIp) {
this.publicIp = publicIp;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d834e8/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
--
diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
index 8c27c18..9e20b49 100644
--- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java
@@ -85,6 +85,10 @@ public class SystemVmResponse extends BaseResponse {
@Param(description = "the hostname for the system VM")
private String hostName;
+@SerializedName("hypervisor")
+@Param(description = "the hypervisor on which the template runs")
+private String hypervisor;
+
@SerializedName(ApiConstants.PRIVATE_IP)
@Param(description = "the private IP address for the system VM")
private String privateIp;
@@ -240,6 +244,14 @@ public class SystemVmResponse extends BaseResponse {
this.hostName = hostName;
}
+public String getHypervisor() {
+return hypervisor;
+}
+
+public void setHypervisor(String hypervisor) {
+this.hypervisor = hypervisor;
+}
+
public String getPrivateIp() {
return privateIp;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d834e8/server/src/com/cloud/api/ApiResponseHelper.java
--
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java
b/server/src/com/cloud/api/ApiResponseHelper.java
index 70ed47d..221e266 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -1166,6 +1166,7 @@ public class ApiResponseHelper implements
ResponseGenerator {
if (host != null) {
vmResponse.setHostId(host.getUuid());
vmResponse.setHostName(host.getName());
+
vmResponse.setHypervisor(host.getHypervisorType().toString());
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9d834e8/server/src/com/clo
git commit: updated refs/heads/master to 129437c
Repository: cloudstack
Updated Branches:
refs/heads/master 12ad25406 -> 129437c63
added more log
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/129437c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/129437c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/129437c6
Branch: refs/heads/master
Commit: 129437c6362e508a384293a8315e24aabacabbc9
Parents: 12ad254
Author: Anthony Xu
Authored: Tue Aug 5 16:41:38 2014 -0700
Committer: Anthony Xu
Committed: Tue Aug 5 16:41:38 2014 -0700
--
server/src/com/cloud/storage/StorageManagerImpl.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/129437c6/server/src/com/cloud/storage/StorageManagerImpl.java
--
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java
b/server/src/com/cloud/storage/StorageManagerImpl.java
index 7f54798..cdd0406 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1033,16 +1033,16 @@ public class StorageManagerImpl extends ManagerBase
implements StorageManager, C
pool.getName());
for (VMTemplateStoragePoolVO templatePoolVO :
unusedTemplatesInPool) {
if (templatePoolVO.getDownloadState() !=
VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
-s_logger.debug("Storage pool garbage
collector is skipping templatePoolVO with ID: " + templatePoolVO.getId() +
-" because it is not completely
downloaded.");
+s_logger.debug("Storage pool garbage
collector is skipping template with ID: " + templatePoolVO.getTemplateId() +
+ " on pool " +
templatePoolVO.getPoolId() + " because it is not completely downloaded.");
continue;
}
if (!templatePoolVO.getMarkedForGC()) {
templatePoolVO.setMarkedForGC(true);
_vmTemplatePoolDao.update(templatePoolVO.getId(), templatePoolVO);
-s_logger.debug("Storage pool garbage
collector has marked templatePoolVO with ID: " + templatePoolVO.getId() +
-" for garbage collection.");
+s_logger.debug("Storage pool garbage
collector has marked template with ID: " + templatePoolVO.getTemplateId() +
+ " on pool " +
templatePoolVO.getPoolId() + " for garbage collection.");
continue;
}
git commit: updated refs/heads/master to 12ad254
Repository: cloudstack Updated Branches: refs/heads/master f7c72cded -> 12ad25406 CLOUDSTACK-6278 Baremetal Advanced Networking support add missing license header Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/12ad2540 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/12ad2540 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/12ad2540 Branch: refs/heads/master Commit: 12ad254069c067761b0132ad6ca76dd90c81b0ce Parents: f7c72cd Author: Frank.Zhang Authored: Tue Aug 5 11:10:39 2014 -0700 Committer: Frank.Zhang Committed: Tue Aug 5 11:11:02 2014 -0700 -- .../BaremetalVirtualRouterCommands.java | 16 scripts/network/ping/baremetal_snat.sh | 19 ++- scripts/network/ping/prepare_pxe.sh | 17 + 3 files changed, 51 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12ad2540/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java -- diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java index 17a86c9..69eccd7 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalVirtualRouterCommands.java @@ -1,3 +1,19 @@ +// 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.baremetal.networkservice; /** http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12ad2540/scripts/network/ping/baremetal_snat.sh -- diff --git a/scripts/network/ping/baremetal_snat.sh b/scripts/network/ping/baremetal_snat.sh index 4cbf20e..f35a16f 100755 --- a/scripts/network/ping/baremetal_snat.sh +++ b/scripts/network/ping/baremetal_snat.sh @@ -1,5 +1,22 @@ #!/bin/bash +#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. + set +u mgmt_nic_ip=$1 @@ -15,4 +32,4 @@ iptables-save | grep -- "-A POSTROUTING -d $internal_server_ip" > /dev/null if [ $? -ne 0 ]; then iptables -t nat -A POSTROUTING -d $internal_server_ip -j SNAT --to-source $mgmt_nic_ip -fi \ No newline at end of file +fi http://git-wip-us.apache.org/repos/asf/cloudstack/blob/12ad2540/scripts/network/ping/prepare_pxe.sh -- diff --git a/scripts/network/ping/prepare_pxe.sh b/scripts/network/ping/prepare_pxe.sh index 7b31c7f..2f22b25 100755 --- a/scripts/network/ping/prepare_pxe.sh +++ b/scripts/network/ping/prepare_pxe.sh @@ -1,4 +1,21 @@ #!/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 Lice
git commit: updated refs/heads/master to f7c72cd
Repository: cloudstack
Updated Branches:
refs/heads/master 1176a836a -> f7c72cded
test_06_destroy_vm in test/integration/smoke/test_vm_life_cycle.py fails
because the expunge parameter is set to true, this also cause tests that
execute in test_vm_life_cycle.py after this test to fail.
Signed-off-by: Nitin Mehta
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7c72cde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7c72cde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7c72cde
Branch: refs/heads/master
Commit: f7c72cdedc0f91a1ef3038e2ab2075add712e665
Parents: 1176a83
Author: Doug Clark
Authored: Tue Aug 5 11:03:00 2014 -0700
Committer: Nitin Mehta
Committed: Tue Aug 5 11:04:26 2014 -0700
--
test/integration/smoke/test_vm_life_cycle.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7c72cde/test/integration/smoke/test_vm_life_cycle.py
--
diff --git a/test/integration/smoke/test_vm_life_cycle.py
b/test/integration/smoke/test_vm_life_cycle.py
index 1386830..eef4dc1 100644
--- a/test/integration/smoke/test_vm_life_cycle.py
+++ b/test/integration/smoke/test_vm_life_cycle.py
@@ -405,7 +405,7 @@ class TestVMLifeCycle(cloudstackTestCase):
#of this VM should be "Destroyed".
self.debug("Destroy VM - ID: %s" % self.small_virtual_machine.id)
-self.small_virtual_machine.delete(self.apiclient)
+self.small_virtual_machine.delete(self.apiclient, expunge=False)
list_vm_response = VirtualMachine.list(
self.apiclient,
git commit: updated refs/heads/hotfix/4.4-7257b to c02892a
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4-7257b [created] c02892a21 CLOUDSTACK-7257: Missing LXC mappings, reuse KVM mappings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c02892a2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c02892a2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c02892a2 Branch: refs/heads/hotfix/4.4-7257b Commit: c02892a21c0266fda7b527b129bc2f8d33301812 Parents: 9315321 Author: amoghvk Authored: Mon Aug 4 14:42:58 2014 -0700 Committer: amoghvk Committed: Tue Aug 5 10:18:49 2014 -0700 -- setup/db/db/schema-440to441.sql | 146 +++ 1 file changed, 146 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c02892a2/setup/db/db/schema-440to441.sql -- diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql index df12ea4..4460559 100644 --- a/setup/db/db/schema-440to441.sql +++ b/setup/db/db/schema-440to441.sql @@ -21,3 +21,149 @@ -- Disable foreign key checking SET foreign_key_checks = 0; +-- Add missing LXC mappings +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.5', 1, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.6', 2, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.7', 3, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.8', 4, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 5, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 6, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 7, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 8, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 9, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 10, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 11, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 12, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 13, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 14, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 111, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 112, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'Red Hat Enterprise Linux 4.5', 26, now(), 0); +INSERT IGNO
git commit: updated refs/heads/hotfix/4.4-7257 to e73e7c3
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4-7257 [created] e73e7c393 CLOUDSTACK-7257: Missing LXC mappings, reuse KVM mappings Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e73e7c39 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e73e7c39 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e73e7c39 Branch: refs/heads/hotfix/4.4-7257 Commit: e73e7c3939b0d5f427521df982c7b0c46bae3e0a Parents: 9315321 Author: amoghvk Authored: Mon Aug 4 14:42:58 2014 -0700 Committer: amoghvk Committed: Tue Aug 5 09:38:57 2014 -0700 -- setup/db/db/schema-440to441.sql | 146 +++ 1 file changed, 146 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e73e7c39/setup/db/db/schema-440to441.sql -- diff --git a/setup/db/db/schema-440to441.sql b/setup/db/db/schema-440to441.sql index df12ea4..4460559 100644 --- a/setup/db/db/schema-440to441.sql +++ b/setup/db/db/schema-440to441.sql @@ -21,3 +21,149 @@ -- Disable foreign key checking SET foreign_key_checks = 0; +-- Add missing LXC mappings +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.5', 1, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.6', 2, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.7', 3, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 4.8', 4, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 5, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.0', 6, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 7, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.1', 8, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 9, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.2', 10, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 11, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.3', 12, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 13, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.4', 14, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 111, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'CentOS 5.5', 112, now(), 0); +INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) VALUES (UUID(), 'LXC', 'default', 'Red Hat Enterprise Linux 4.5', 26, now(), 0); +INSERT IGNORE
git commit: updated refs/heads/master to 1176a83
Repository: cloudstack Updated Branches: refs/heads/master 07f916dfc -> 1176a836a server: use scoped variable in pom.xml for build.properties file path Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1176a836 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1176a836 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1176a836 Branch: refs/heads/master Commit: 1176a836af7b4460a899c03d12bca7ce0cd4bf19 Parents: 07f916d Author: Rohit Yadav Authored: Tue Aug 5 18:29:21 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 18:30:14 2014 +0200 -- server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1176a836/server/pom.xml -- diff --git a/server/pom.xml b/server/pom.xml index 6e60fc4..1b21ebd 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -205,7 +205,7 @@ - +
git commit: updated refs/heads/master to 07f916d
Repository: cloudstack
Updated Branches:
refs/heads/master 3433eb7c0 -> 07f916dfc
CLOUDSTACK-7159 Added "state" parameter to the "listPublicIpAddresses" API call
Signed-off-by: Ilia Shakitko
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/07f916df
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/07f916df
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/07f916df
Branch: refs/heads/master
Commit: 07f916dfc6fb30dc928b258beeaa761253e43ab9
Parents: 3433eb7
Author: Ilia Shakitko
Authored: Tue Aug 5 17:58:46 2014 +0200
Committer: Rohit Yadav
Committed: Tue Aug 5 18:13:38 2014 +0200
--
.../user/address/ListPublicIpAddressesCmd.java | 35 +++-
.../com/cloud/server/ManagementServerImpl.java | 10 ++
2 files changed, 29 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07f916df/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
index 07ccfe9..5720a50 100644
---
a/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/address/ListPublicIpAddressesCmd.java
@@ -53,6 +53,9 @@ public class ListPublicIpAddressesCmd extends
BaseListTaggedResourcesCmd {
@Parameter(name = ApiConstants.ALLOCATED_ONLY, type = CommandType.BOOLEAN,
description = "limits search results to allocated public IP addresses")
private Boolean allocatedOnly;
+@Parameter(name = ApiConstants.STATE, type = CommandType.STRING,
description = "lists all public IP addresses by state")
+private String state;
+
@Parameter(name = ApiConstants.FOR_VIRTUAL_NETWORK, type =
CommandType.BOOLEAN, description = "the virtual network for the IP address")
private Boolean forVirtualNetwork;
@@ -150,6 +153,22 @@ public class ListPublicIpAddressesCmd extends
BaseListTaggedResourcesCmd {
return super.getDisplay();
}
+public Boolean isForLoadBalancing() {
+return forLoadBalancing;
+}
+
+public Boolean getForVirtualNetwork() {
+return forVirtualNetwork;
+}
+
+public Boolean getForLoadBalancing() {
+return forLoadBalancing;
+}
+
+public String getState() {
+return state;
+}
+
/
/// API Implementation///
/
@@ -178,20 +197,4 @@ public class ListPublicIpAddressesCmd extends
BaseListTaggedResourcesCmd {
public ApiCommandJobType getInstanceType() {
return ApiCommandJobType.IpAddress;
}
-
-public Boolean isForLoadBalancing() {
-return forLoadBalancing;
-}
-
-public Boolean getAllocatedOnly() {
-return allocatedOnly;
-}
-
-public Boolean getForVirtualNetwork() {
-return forVirtualNetwork;
-}
-
-public Boolean getForLoadBalancing() {
-return forLoadBalancing;
-}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07f916df/server/src/com/cloud/server/ManagementServerImpl.java
--
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java
b/server/src/com/cloud/server/ManagementServerImpl.java
index 1413272..7b5422e 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1730,9 +1730,14 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
Boolean forDisplay = cmd.getDisplay();
Map tags = cmd.getTags();
+String state = cmd.getState();
Boolean isAllocated = cmd.isAllocatedOnly();
if (isAllocated == null) {
isAllocated = Boolean.TRUE;
+
+if (state != null) {
+isAllocated = Boolean.FALSE;
+}
}
Filter searchFilter = new Filter(IPAddressVO.class, "address", false,
cmd.getStartIndex(), cmd.getPageSizeVal());
@@ -1763,6 +1768,7 @@ public class ManagementServerImpl extends ManagerBase
implements ManagementServe
sb.and("isSourceNat", sb.entity().isSourceNat(), SearchCriteria.Op.EQ);
sb.and("isStaticNat", sb.entity().isOneToOneNat(),
SearchCriteria.Op.EQ);
sb.and("vpcId", sb.entity().getVpcId(), SearchCriteria.Op.EQ);
+sb.and("state", sb.entity().getState(), SearchCriteria.Op.EQ);
sb.and("display", sb.e
git commit: updated refs/heads/hotfix/4.4-svm-upgrade to 21a6a69
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4-svm-upgrade 00c2696e7 -> 21a6a6993
remove update to 4.3 templates for 4.4
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21a6a699
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21a6a699
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21a6a699
Branch: refs/heads/hotfix/4.4-svm-upgrade
Commit: 21a6a6993e1ac73a1f4e790e0b004377f5ffd708
Parents: 00c2696
Author: Daan Hoogland
Authored: Tue Aug 5 17:48:58 2014 +0200
Committer: Daan Hoogland
Committed: Tue Aug 5 17:48:58 2014 +0200
--
.../com/cloud/upgrade/dao/Upgrade421to430.java | 158 ---
1 file changed, 158 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21a6a699/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index 50822a3..1ab462a 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -24,15 +24,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.crypt.DBEncryptionUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -70,7 +65,6 @@ public class Upgrade421to430 implements DbUpgrade {
encryptLdapConfigParams(conn);
encryptImageStoreDetails(conn);
upgradeMemoryOfSsvmOffering(conn);
-updateSystemVmTemplates(conn);
}
private void upgradeMemoryOfSsvmOffering(Connection conn) {
@@ -195,158 +189,6 @@ public class Upgrade421to430 implements DbUpgrade {
}
-private void updateSystemVmTemplates(Connection conn) {
-s_logger.debug("Updating System Vm template IDs");
-try{
-//Get all hypervisors in use
-Set hypervisorsListInUse = new
HashSet();
-try(PreparedStatement pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
-ResultSet rs = pstmt.executeQuery();
-) {
-while(rs.next()){
-switch
(Hypervisor.HypervisorType.getType(rs.getString(1))) {
-case XenServer:
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
-break;
-case KVM:
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
-break;
-case VMware:
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
-break;
-case Hyperv:
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
-break;
-case LXC:
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
-break;
-}
-}
-} catch (Exception e) {
-
s_logger.error("updateSystemVmTemplates:Exception:"+e.getMessage());
-throw new
CloudRuntimeException("updateSystemVmTemplates:Exception:"+e.getMessage(), e);
-}
-
-Map NewTemplateNameList = new
HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.3");
-put(Hypervisor.HypervisorType.VMware,
"systemvm-vmware-4.3");
-put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.3");
-put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.3");
-put(Hypervisor.HypervisorType.Hyperv,
"systemvm-hyperv-4.3");
-}
-};
-
-Map
routerTemplateConfigurationNames = new HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer,
"router.template.xen");
-put(Hypervisor.HypervisorType.VMware,
"router.template.vmware");
-put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
-put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
-put(Hypervisor.HypervisorType.Hyperv,
"router.template.hyperv");
-}
-};
-
-Map newTemplateUrl = new
HashMap(){
-{ put(Hypervisor.HypervisorType.XenServer
git commit: updated refs/heads/master to 3433eb7
Repository: cloudstack Updated Branches: refs/heads/master fc7b2baba -> 3433eb7c0 README: Import README sections from 4.4 branch into master We had a README file in our release branches, this commit grabs few useful sections from that file into master's README file. Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3433eb7c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3433eb7c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3433eb7c Branch: refs/heads/master Commit: 3433eb7c093289ae81e99a3bdf8fe3038aa752a3 Parents: fc7b2ba Author: Rohit Yadav Authored: Tue Aug 5 17:44:08 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 17:44:08 2014 +0200 -- README.md | 61 -- 1 file changed, 59 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3433eb7c/README.md -- diff --git a/README.md b/README.md index c6f0ab3..cce22ae 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,57 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. +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. + +Please see the [LICENSE](LICENSE) file included in the root directory +of the source tree for extended license details. + +## Notice of Cryptographic Software + +This distribution includes cryptographic software. The country in which you currently +reside may have restrictions on the import, possession, use, and/or re-export to another +country, of encryption software. BEFORE using any encryption software, please check your +country's laws, regulations and policies concerning the import, possession, or use, and +re-export of encryption software, to see if this is permitted. See http://www.wassenaar.org/ +for more information. + +The U.S. Government Department of Commerce, Bureau of Industry and Security (BIS), has +classified this software as Export Commodity Control Number (ECCN) 5D002.C.1, which +includes information security software using or performing cryptographic functions with +asymmetric algorithms. The form and manner of this Apache Software Foundation distribution +makes it eligible for export under the License Exception ENC Technology Software +Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section +740.13) for both object code and source code. + +The following provides more details on the included cryptographic software: + + CloudStack makes use of JaSypt cryptographic libraries + + CloudStack has a system requirement of MySQL, and uses native database encryption + functionality. + + CloudStack makes use of the Bouncy Castle general-purpose encryption library. + + CloudStack can optionally interacts with and controls OpenSwan-based VPNs. + + CloudStack has a dependency on Apache WSS4J as part of the AWSAPI implementation. + + CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation. ## Downloading @@ -97,6 +147,13 @@ several communications channels, the mailing lists are the most active and the official channels for making decisions about the project itself. Mailing lists: +- [Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org) +- [Users Mailing List](mailto:users-subscr...@cloudstack.apache.org) +- [Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org) +- [Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org) +- [Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org) + +For more details on mailing lists subscription and usage, please visit: http://cloudstack.apache.org/mailing-lists.html IRC, join us on irc.freenode.net on: @@ -110,7 +167,7 @@ https://issues.apache.org/jira/browse/CLOUDSTACK Developer resources: http://cloudstack.apache.org/developers.html -For more details please see our contributin
[2/2] git commit: updated refs/heads/hotfix/4.4-readme to 881275c
README: Fix links for viewing on Github Signed-off-by: Rohit Yadav (cherry picked from commit fc7b2baba33ee990c5edc70503d01acf55e6a973) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/881275c1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/881275c1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/881275c1 Branch: refs/heads/hotfix/4.4-readme Commit: 881275c16ce884e806423473fb6316746149986d Parents: 7e9269e Author: Rohit Yadav Authored: Tue Aug 5 16:02:44 2014 +0200 Committer: Daan Hoogland Committed: Tue Aug 5 17:31:53 2014 +0200 -- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/881275c1/README.md -- diff --git a/README.md b/README.md index 600f783..657b948 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the LICENSE file included in the root directory of the source tree. +Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. ## Downloading @@ -54,11 +54,11 @@ You can download released versions from: http://cloudstack.apache.org/downloads. ## Building -Please see the INSTALL.md file included in the root directory of the source tree. +Please see the [INSTALL.md](INSTALL.md) file included in the root directory of the source tree. -### Tooling +## Tooling -Please see the README.tools.md file included in the root directory of the source tree. +Please see the [README.tools.md](README.tools.md) file included in the root directory of the source tree. ## Documentation @@ -77,7 +77,7 @@ http://docs.cloudstack.apache.org/projects/cloudstack-administration Latest release notes: http://docs.cloudstack.apache.org/projects/cloudstack-release-notes -Design documents:: +Design documents: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design API documentation: @@ -113,7 +113,7 @@ http://cloudstack.apache.org/developers.html For more details please see our contributing page: http://cloudstack.apache.org/contribute.html -### News and Events +## News and Events Blog: https://blogs.apache.org/cloudstack @@ -127,7 +127,7 @@ http://planet.apache.org/cloudstack Events and meetup: http://lanyrd.com/topics/apache-cloudstack -### Reporting Security Vulnerabilities +## Reporting Security Vulnerabilities If you've found an issue that you believe is a security vulnerability in a released version of CloudStack, please report it to
[1/2] git commit: updated refs/heads/hotfix/4.4-readme to 881275c
Repository: cloudstack Updated Branches: refs/heads/hotfix/4.4-readme [created] 881275c16 README: Give CloudStack its much deserved readme file Signed-off-by: Rohit Yadav (cherry picked from commit d753e765f7ca848e4cc79d25ba5fa986b8b63522) Conflicts: README.md Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e9269eb Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e9269eb Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e9269eb Branch: refs/heads/hotfix/4.4-readme Commit: 7e9269eb2d9792834d7175184e58a901bec18039 Parents: 9315321 Author: Rohit Yadav Authored: Tue Aug 5 15:54:40 2014 +0200 Committer: Daan Hoogland Committed: Tue Aug 5 17:31:08 2014 +0200 -- README.md | 175 + pom.xml | 1 + 2 files changed, 115 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e9269eb/README.md -- diff --git a/README.md b/README.md index 009df83..600f783 100644 --- a/README.md +++ b/README.md @@ -1,84 +1,137 @@ -Apache CloudStack Version 4.4.1 +# Apache CloudStack -# About Apache CloudStack +Apache CloudStack is open source software designed to deploy and manage large +networks of virtual machines, as a highly available, highly scalable +Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used +by a number of service providers to offer public cloud services, and by many +companies to provide an on-premises (private) cloud offering, or as part of a +hybrid cloud solution. -Apache CloudStack is software designed to deploy -and manage large networks of virtual machines, as a highly -available, highly scalable Infrastructure as a Service (IaaS) -cloud computing platform. CloudStack is used by a number of -service providers to offer public cloud services, and by many -companies to provide an on-premises (private) cloud offering. +CloudStack is a turnkey solution that includes the entire "stack" of features +most organizations want with an IaaS cloud: compute orchestration, +Network-as-a-Service, user and account management, a full and open native API, +resource accounting, and a first-class User Interface (UI). -Apache CloudStack currently supports the most popular hypervisors: -VMware, Oracle VM, KVM, XenServer and Xen Cloud Platform. -CloudStack also offers bare metal management of servers, -using PXE to provision OS images and IPMI to manage the server. -Apache CloudStack offers three methods for managing cloud -computing environments: an easy to use Web interface, command -line tools, and a full-featured RESTful API. +CloudStack currently supports the most popular hypervisors: +VMware, KVM, XenServer, Xen Cloud Platform (XCP) and Hyper-V. -Visit us at [Apache CloudStack](http://cloudstack.apache.org). +Users can manage their cloud with an easy to use Web interface, command line +tools, and/or a full-featured RESTful API. In addition, CloudStack provides an +API that's compatible with AWS EC2 and S3 for organizations that wish to deploy +hybrid clouds. -## Mailing lists -[Development Mailing List](mailto:dev-subscr...@cloudstack.apache.org) -[Users Mailing List](mailto:users-subscr...@cloudstack.apache.org) -[Commits Mailing List](mailto:commits-subscr...@cloudstack.apache.org) -[Issues Mailing List](mailto:issues-subscr...@cloudstack.apache.org) -[Marketing Mailing List](mailto:marketing-subscr...@cloudstack.apache.org) +For more information on Apache CloudStack, please visit: +http://cloudstack.apache.org -# License +## Who Uses CloudStack? -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 +There are more than 150 known organisations using Apache CloudStack (or a +commercial distribution of CloudStack). Our users include many major service +providers running CloudStack to offer public cloud services, product vendors who +incorporate or integrate with Cloudstack in their own products, organisations +who have used Cloudstack to build their own private clouds, and systems +integrators that offer CloudStack related services. - http://www.apache.org/licenses/LICENSE-2.0 +For case studies highlighting successful deployments of Apache CloudStack, please +visit: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies -Unless required by applicable law or agreed to in writing, -software dis
git commit: updated refs/heads/feature/saml2 to 6cf63f2
Repository: cloudstack Updated Branches: refs/heads/feature/saml2 fc7b2baba -> 6cf63f2f0 CLOUDSTACK-7083: Add SAML2 SSO plugin skeleton and stub Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6cf63f2f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6cf63f2f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6cf63f2f Branch: refs/heads/feature/saml2 Commit: 6cf63f2f081603cb659fa5c2a5ee4dea9191af76 Parents: fc7b2ba Author: Rohit Yadav Authored: Tue Aug 5 17:03:44 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 17:07:00 2014 +0200 -- plugins/pom.xml | 1 + .../saml2/findbugsExcludeFilter.xml | 25 +++ plugins/user-authenticators/saml2/pom.xml | 29 .../META-INF/cloudstack/saml2/module.properties | 18 .../cloudstack/saml2/spring-saml2-context.xml | 32 ++ .../cloudstack/SAML2UserAuthenticator.java | 46 .../cloudstack/SAML2UserAuthenticatorTest.java | 39 + 7 files changed, 190 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cf63f2f/plugins/pom.xml -- diff --git a/plugins/pom.xml b/plugins/pom.xml index b3890c0..0b1b62d 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -72,6 +72,7 @@ user-authenticators/ldap user-authenticators/md5 user-authenticators/plain-text +user-authenticators/saml2 user-authenticators/sha256salted network-elements/dns-notifier storage/image/s3 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cf63f2f/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml -- diff --git a/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml b/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml new file mode 100644 index 000..d372850 --- /dev/null +++ b/plugins/user-authenticators/saml2/findbugsExcludeFilter.xml @@ -0,0 +1,25 @@ + + + + + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cf63f2f/plugins/user-authenticators/saml2/pom.xml -- diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml new file mode 100644 index 000..bfe5eb7 --- /dev/null +++ b/plugins/user-authenticators/saml2/pom.xml @@ -0,0 +1,29 @@ + +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + 4.0.0 + cloud-plugin-user-authenticator-saml2 + Apache CloudStack Plugin - User Authenticator SAML2 + +org.apache.cloudstack +cloudstack-plugins +4.5.0-SNAPSHOT +../../pom.xml + + http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cf63f2f/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties -- diff --git a/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties b/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties new file mode 100644 index 000..0da9d5b --- /dev/null +++ b/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/module.properties @@ -0,0 +1,18 @@ +# 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. +name=saml2 +parent=api http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6cf63f2f/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml -- diff --git a/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml b/plugins/user-authenticators/saml2/resources/META-INF/cloudstack/saml2/spring-saml2-context.xml new file mode
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/feature/saml2 [created] fc7b2baba
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/feature/readme [deleted] fc7b2baba
[1/2] git commit: updated refs/heads/master to fc7b2ba
Repository: cloudstack Updated Branches: refs/heads/master fce2880b9 -> fc7b2baba README: Give CloudStack its much deserved readme file Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d753e765 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d753e765 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d753e765 Branch: refs/heads/master Commit: d753e765f7ca848e4cc79d25ba5fa986b8b63522 Parents: fce2880 Author: Rohit Yadav Authored: Tue Aug 5 15:54:40 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 15:54:40 2014 +0200 -- README.md | 138 + pom.xml | 1 + 2 files changed, 139 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d753e765/README.md -- diff --git a/README.md b/README.md new file mode 100644 index 000..836bc17 --- /dev/null +++ b/README.md @@ -0,0 +1,138 @@ +# Apache CloudStack + +Apache CloudStack is open source software designed to deploy and manage large +networks of virtual machines, as a highly available, highly scalable +Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used +by a number of service providers to offer public cloud services, and by many +companies to provide an on-premises (private) cloud offering, or as part of a +hybrid cloud solution. + +CloudStack is a turnkey solution that includes the entire "stack" of features +most organizations want with an IaaS cloud: compute orchestration, +Network-as-a-Service, user and account management, a full and open native API, +resource accounting, and a first-class User Interface (UI). + +CloudStack currently supports the most popular hypervisors: +VMware, KVM, XenServer, Xen Cloud Platform (XCP) and Hyper-V. + +Users can manage their cloud with an easy to use Web interface, command line +tools, and/or a full-featured RESTful API. In addition, CloudStack provides an +API that's compatible with AWS EC2 and S3 for organizations that wish to deploy +hybrid clouds. + +For more information on Apache CloudStack, please visit: +http://cloudstack.apache.org + +## Who Uses CloudStack? + +There are more than 150 known organisations using Apache CloudStack (or a +commercial distribution of CloudStack). Our users include many major service +providers running CloudStack to offer public cloud services, product vendors who +incorporate or integrate with Cloudstack in their own products, organisations +who have used Cloudstack to build their own private clouds, and systems +integrators that offer CloudStack related services. + +For case studies highlighting successful deployments of Apache CloudStack, please +visit: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies + +For the up-to-date list of current users, please visit: +http://cloudstack.apache.org/users.html + +If you are using CloudStack in your organisation and your company isn't listed +above, please complete our brief adoption survey. We're happy to keep your +company name anonymous if you require. + +CloudStack survey page: http://cloudstack.apache.org/survey.html + +## License + +Please see the LICENSE file included in the root directory of the source tree. + +## Downloading + +You can download released versions from: http://cloudstack.apache.org/downloads.html + +## Building + +Please see the INSTALL.md file included in the root directory of the source tree. + +### Tooling + +Please see the README.tools.md file included in the root directory of the source tree. + +## Documentation + +Project wiki: +https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home + +Getting started documentation: +http://docs.cloudstack.apache.org/en/master + +Installation documentation: +http://docs.cloudstack.apache.org/projects/cloudstack-installation + +Administration documentation: +http://docs.cloudstack.apache.org/projects/cloudstack-administration + +Latest release notes: +http://docs.cloudstack.apache.org/projects/cloudstack-release-notes + +Design documents:: +https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design + +API documentation: +http://cloudstack.apache.org/docs/api + +## Getting Involved and Contributing + +Interested in helping out with Apache CloudStack? Great! We welcome +participation from anybody willing to work The Apache Way and make a +contribution. Note that you do not have to be a developer in order to contribute +to Apache CloudStack. We need folks to help with documentation, translation, +promotion etc. + +If you're interested in learning more or participating in the Apache CloudStack +project, the mailing lists are the best way to do that. While the project has +several communications channels, the ma
[2/2] git commit: updated refs/heads/master to fc7b2ba
README: Fix links for viewing on Github Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc7b2bab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc7b2bab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc7b2bab Branch: refs/heads/master Commit: fc7b2baba33ee990c5edc70503d01acf55e6a973 Parents: d753e76 Author: Rohit Yadav Authored: Tue Aug 5 16:02:44 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 16:02:44 2014 +0200 -- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc7b2bab/README.md -- diff --git a/README.md b/README.md index 836bc17..c6f0ab3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the LICENSE file included in the root directory of the source tree. +Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. ## Downloading @@ -54,11 +54,11 @@ You can download released versions from: http://cloudstack.apache.org/downloads. ## Building -Please see the INSTALL.md file included in the root directory of the source tree. +Please see the [INSTALL.md](INSTALL.md) file included in the root directory of the source tree. -### Tooling +## Tooling -Please see the README.tools.md file included in the root directory of the source tree. +Please see the [README.tools.md](README.tools.md) file included in the root directory of the source tree. ## Documentation @@ -77,7 +77,7 @@ http://docs.cloudstack.apache.org/projects/cloudstack-administration Latest release notes: http://docs.cloudstack.apache.org/projects/cloudstack-release-notes -Design documents:: +Design documents: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design API documentation: @@ -113,7 +113,7 @@ http://cloudstack.apache.org/developers.html For more details please see our contributing page: http://cloudstack.apache.org/contribute.html -### News and Events +## News and Events Blog: https://blogs.apache.org/cloudstack @@ -127,7 +127,7 @@ http://planet.apache.org/cloudstack Events and meetup: http://lanyrd.com/topics/apache-cloudstack -### Reporting Security Vulnerabilities +## Reporting Security Vulnerabilities If you've found an issue that you believe is a security vulnerability in a released version of CloudStack, please report it to
git commit: updated refs/heads/feature/readme to fc7b2ba
Repository: cloudstack Updated Branches: refs/heads/feature/readme d753e765f -> fc7b2baba README: Fix links for viewing on Github Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc7b2bab Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc7b2bab Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc7b2bab Branch: refs/heads/feature/readme Commit: fc7b2baba33ee990c5edc70503d01acf55e6a973 Parents: d753e76 Author: Rohit Yadav Authored: Tue Aug 5 16:02:44 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 16:02:44 2014 +0200 -- README.md | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc7b2bab/README.md -- diff --git a/README.md b/README.md index 836bc17..c6f0ab3 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ CloudStack survey page: http://cloudstack.apache.org/survey.html ## License -Please see the LICENSE file included in the root directory of the source tree. +Please see the [LICENSE](LICENSE) file included in the root directory of the source tree. ## Downloading @@ -54,11 +54,11 @@ You can download released versions from: http://cloudstack.apache.org/downloads. ## Building -Please see the INSTALL.md file included in the root directory of the source tree. +Please see the [INSTALL.md](INSTALL.md) file included in the root directory of the source tree. -### Tooling +## Tooling -Please see the README.tools.md file included in the root directory of the source tree. +Please see the [README.tools.md](README.tools.md) file included in the root directory of the source tree. ## Documentation @@ -77,7 +77,7 @@ http://docs.cloudstack.apache.org/projects/cloudstack-administration Latest release notes: http://docs.cloudstack.apache.org/projects/cloudstack-release-notes -Design documents:: +Design documents: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design API documentation: @@ -113,7 +113,7 @@ http://cloudstack.apache.org/developers.html For more details please see our contributing page: http://cloudstack.apache.org/contribute.html -### News and Events +## News and Events Blog: https://blogs.apache.org/cloudstack @@ -127,7 +127,7 @@ http://planet.apache.org/cloudstack Events and meetup: http://lanyrd.com/topics/apache-cloudstack -### Reporting Security Vulnerabilities +## Reporting Security Vulnerabilities If you've found an issue that you believe is a security vulnerability in a released version of CloudStack, please report it to
git commit: updated refs/heads/feature/readme to d753e76
Repository: cloudstack Updated Branches: refs/heads/feature/readme [created] d753e765f README: Give CloudStack its much deserved readme file Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d753e765 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d753e765 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d753e765 Branch: refs/heads/feature/readme Commit: d753e765f7ca848e4cc79d25ba5fa986b8b63522 Parents: fce2880 Author: Rohit Yadav Authored: Tue Aug 5 15:54:40 2014 +0200 Committer: Rohit Yadav Committed: Tue Aug 5 15:54:40 2014 +0200 -- README.md | 138 + pom.xml | 1 + 2 files changed, 139 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d753e765/README.md -- diff --git a/README.md b/README.md new file mode 100644 index 000..836bc17 --- /dev/null +++ b/README.md @@ -0,0 +1,138 @@ +# Apache CloudStack + +Apache CloudStack is open source software designed to deploy and manage large +networks of virtual machines, as a highly available, highly scalable +Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used +by a number of service providers to offer public cloud services, and by many +companies to provide an on-premises (private) cloud offering, or as part of a +hybrid cloud solution. + +CloudStack is a turnkey solution that includes the entire "stack" of features +most organizations want with an IaaS cloud: compute orchestration, +Network-as-a-Service, user and account management, a full and open native API, +resource accounting, and a first-class User Interface (UI). + +CloudStack currently supports the most popular hypervisors: +VMware, KVM, XenServer, Xen Cloud Platform (XCP) and Hyper-V. + +Users can manage their cloud with an easy to use Web interface, command line +tools, and/or a full-featured RESTful API. In addition, CloudStack provides an +API that's compatible with AWS EC2 and S3 for organizations that wish to deploy +hybrid clouds. + +For more information on Apache CloudStack, please visit: +http://cloudstack.apache.org + +## Who Uses CloudStack? + +There are more than 150 known organisations using Apache CloudStack (or a +commercial distribution of CloudStack). Our users include many major service +providers running CloudStack to offer public cloud services, product vendors who +incorporate or integrate with Cloudstack in their own products, organisations +who have used Cloudstack to build their own private clouds, and systems +integrators that offer CloudStack related services. + +For case studies highlighting successful deployments of Apache CloudStack, please +visit: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Case+Studies + +For the up-to-date list of current users, please visit: +http://cloudstack.apache.org/users.html + +If you are using CloudStack in your organisation and your company isn't listed +above, please complete our brief adoption survey. We're happy to keep your +company name anonymous if you require. + +CloudStack survey page: http://cloudstack.apache.org/survey.html + +## License + +Please see the LICENSE file included in the root directory of the source tree. + +## Downloading + +You can download released versions from: http://cloudstack.apache.org/downloads.html + +## Building + +Please see the INSTALL.md file included in the root directory of the source tree. + +### Tooling + +Please see the README.tools.md file included in the root directory of the source tree. + +## Documentation + +Project wiki: +https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home + +Getting started documentation: +http://docs.cloudstack.apache.org/en/master + +Installation documentation: +http://docs.cloudstack.apache.org/projects/cloudstack-installation + +Administration documentation: +http://docs.cloudstack.apache.org/projects/cloudstack-administration + +Latest release notes: +http://docs.cloudstack.apache.org/projects/cloudstack-release-notes + +Design documents:: +https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design + +API documentation: +http://cloudstack.apache.org/docs/api + +## Getting Involved and Contributing + +Interested in helping out with Apache CloudStack? Great! We welcome +participation from anybody willing to work The Apache Way and make a +contribution. Note that you do not have to be a developer in order to contribute +to Apache CloudStack. We need folks to help with documentation, translation, +promotion etc. + +If you're interested in learning more or participating in the Apache CloudStack +project, the mailing lists are the best way to do that. While the project has +several communications cha
git commit: updated refs/heads/master to fce2880
Repository: cloudstack
Updated Branches:
refs/heads/master c76302cdd -> fce2880b9
CLOUDSTACK-2694: Able to configure duplicate firewall rule with protocol and no
ports
Signed-off-by: Jayapal
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fce2880b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fce2880b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fce2880b
Branch: refs/heads/master
Commit: fce2880b9f20a372dd0a005c4575ffab526bac0b
Parents: c76302c
Author: namita.chaudhari
Authored: Tue Aug 5 09:16:29 2014 +
Committer: Jayapal
Committed: Tue Aug 5 17:57:54 2014 +0530
--
server/src/com/cloud/network/firewall/FirewallManagerImpl.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fce2880b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
--
diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index dd928d8..50ac9d1 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -404,6 +404,12 @@ public class FirewallManagerImpl extends ManagerBase
implements FirewallService,
boolean notNullPorts =
(newRule.getSourcePortStart() != null &&
newRule.getSourcePortEnd() != null && rule.getSourcePortStart() != null &&
rule.getSourcePortEnd() != null);
+boolean nullPorts =
+(newRule.getSourcePortStart() == null &&
newRule.getSourcePortEnd() == null && rule.getSourcePortStart() == null &&
rule.getSourcePortEnd() == null);
+if(nullPorts && duplicatedCidrs &&
(rule.getProtocol().equalsIgnoreCase(newRule.getProtocol(
+{
+throw new NetworkRuleConflictException("There is already a
firewall rule specified with protocol = " +newRule.getProtocol()+ " and no
ports");
+}
if (!notNullPorts) {
continue;
} else if (!oneOfRulesIsFirewall &&
git commit: updated refs/heads/master to c76302c
Repository: cloudstack
Updated Branches:
refs/heads/master 64b9ca0a3 -> c76302cdd
CLOUDSTACK-7240: Fixed expunge VM issue in test_persistent_networks.py
Signed-off-by: Santhosh Edukulla
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c76302cd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c76302cd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c76302cd
Branch: refs/heads/master
Commit: c76302cdd8a70498a792db5d7fbe82ad43b7f8b5
Parents: 64b9ca0
Author: Gaurav Aradhye
Authored: Tue Aug 5 15:04:12 2014 +0530
Committer: Santhosh Edukulla
Committed: Tue Aug 5 17:30:41 2014 +0530
--
.../component/test_persistent_networks.py| 15 +--
1 file changed, 5 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c76302cd/test/integration/component/test_persistent_networks.py
--
diff --git a/test/integration/component/test_persistent_networks.py
b/test/integration/component/test_persistent_networks.py
index 210063e..b242579 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -163,11 +163,6 @@ class TestPersistentNetworks(cloudstackTestCase):
def verifyVmExpungement(self, virtual_machine):
"""verify if vm is expunged"""
isVmExpunged = False
-try:
-virtual_machine.delete(self.apiclient, expunge=True)
-except Exception as e:
-self.fail("Failed to delete VM: %s with error %s" %
(virtual_machine.id, e))
-
# Verify if it is expunged
retriesCount = 20
while True:
@@ -232,7 +227,7 @@ class TestPersistentNetworks(cloudstackTestCase):
virtual_machine =
VirtualMachine.create(self.apiclient,self.services["virtual_machine"],
networkids=[network.id],serviceofferingid=self.service_offering.id,
accountid=self.account.name,domainid=self.domain.id)
-virtual_machine.delete(self.apiclient, expunge=True)
+virtual_machine.delete(self.apiclient)
except Exception as e:
self.fail("vm creation failed: %s" % e)
@@ -378,7 +373,7 @@ class TestPersistentNetworks(cloudstackTestCase):
self.fail("Exception while SSHing to VM %s with IP %s" %
(virtual_machine.id, ipaddress.ipaddress.ipaddress))
# Delete VM
-virtual_machine.delete(self.api_client, expunge=True)
+virtual_machine.delete(self.api_client)
# Verify VM is expunged
self.verifyVmExpungement(virtual_machine)
@@ -457,7 +452,7 @@ class TestPersistentNetworks(cloudstackTestCase):
except Exception as e:
self.fail("Exception while SSHing to VM %s with IP %s" %
(virtual_machine.id, ipaddress.ipaddress.ipaddress))
-virtual_machine.delete(self.api_client, expunge=True)
+virtual_machine.delete(self.api_client)
# Verify VM is expunged
self.verifyVmExpungement(virtual_machine)
@@ -540,7 +535,7 @@ class TestPersistentNetworks(cloudstackTestCase):
except Exception as e:
self.fail("Exception while SSHing to VM %s with IP %s" %
(virtual_machine.id, ipaddress.ipaddress.ipaddress))
-virtual_machine.delete(self.api_client, expunge=True)
+virtual_machine.delete(self.api_client)
# Verify VM is expunged
self.verifyVmExpungement(virtual_machine)
@@ -919,7 +914,7 @@ class TestPersistentNetworks(cloudstackTestCase):
self.fail("Exception while SSHing to VM %s with IP %s" %
(virtual_machine.id, ipaddress.ipaddress.ipaddress))
# Delete VM
-virtual_machine.delete(self.api_client, expunge=True)
+virtual_machine.delete(self.api_client)
# Verify VM is expunged
self.verifyVmExpungement(virtual_machine)
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/agent-ipv6 [deleted] 12572e8a9
git commit: updated refs/heads/master to 64b9ca0
Repository: cloudstack
Updated Branches:
refs/heads/master 221c118b4 -> 64b9ca0a3
Fixed a coverity reported concurrency issue
Signed-off-by: Santhosh Edukulla
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64b9ca0a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64b9ca0a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64b9ca0a
Branch: refs/heads/master
Commit: 64b9ca0a35f18437741f83f8b06665af1331f290
Parents: 221c118
Author: Santhosh Edukulla
Authored: Tue Aug 5 17:14:05 2014 +0530
Committer: Santhosh Edukulla
Committed: Tue Aug 5 17:16:09 2014 +0530
--
.../server/src/com/cloud/consoleproxy/ConsoleProxy.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64b9ca0a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
--
diff --git
a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
index 3b3b82f..863f0bf 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java
@@ -504,7 +504,9 @@ public class ConsoleProxy {
}
public static ConsoleProxyClientStatsCollector getStatsCollector() {
-return new ConsoleProxyClientStatsCollector(connectionMap);
+synchronized (connectionMap) {
+return new ConsoleProxyClientStatsCollector(connectionMap);
+}
}
public static void authenticationExternally(ConsoleProxyClientParam param)
throws AuthenticationException {
[2/2] git commit: updated refs/heads/master to 221c118
CLOUDSTACK-7245: listIsos call does not return isdynamicallyscalable in the
response attributes as mentioned in API docs.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/221c118b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/221c118b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/221c118b
Branch: refs/heads/master
Commit: 221c118b4fcfb73f77d21c8e33783d3456bd6c35
Parents: 2dfd278
Author: Damodar
Authored: Tue Aug 5 12:33:13 2014 +0530
Committer: Kishan Kavala
Committed: Tue Aug 5 16:06:01 2014 +0530
--
server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/221c118b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index 4c8ada1..d3e1253 100644
--- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@ -278,6 +278,7 @@ public class TemplateJoinDaoImpl extends
GenericDaoBase im
isoResponse.setPublic(iso.isPublicTemplate());
isoResponse.setExtractable(iso.isExtractable() &&
!(iso.getTemplateType() == TemplateType.PERHOST));
isoResponse.setCreated(iso.getCreatedOnStore());
+isoResponse.setDynamicallyScalable(iso.isDynamicallyScalable());
if (iso.getTemplateType() == TemplateType.PERHOST) {
// for xs-tools.iso and vmware-tools.iso, we didn't download, but
is ready to use.
isoResponse.setReady(true);
[1/2] git commit: updated refs/heads/master to 221c118
Repository: cloudstack
Updated Branches:
refs/heads/master 210941846 -> 221c118b4
CLOUDSTACK-7087: Latest OS X VPN client not working Downgrading openswan
version to 1:2.6.37-3
Reviewed-by: Abhinandan
Signed-off-by: Sheng Yang
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2dfd2786
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2dfd2786
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2dfd2786
Branch: refs/heads/master
Commit: 2dfd278625a5d569a5cce2fec5ccb0d7c515c9e8
Parents: 2109418
Author: Harikrishna Patnala
Authored: Wed Jul 9 14:02:12 2014 -0700
Committer: Kishan Kavala
Committed: Tue Aug 5 16:06:00 2014 +0530
--
tools/appliance/definitions/systemvm64template/postinstall.sh | 2 +-
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2dfd2786/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 8763a9f..da16cb8 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -59,7 +59,7 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install xl2tpd bcrelay ppp
ipsec-tools tdb-tools
echo "openswan openswan/install_x509_certificate boolean false" |
debconf-set-selections
echo "openswan openswan/install_x509_certificate seen true" |
debconf-set-selections
- apt-get --no-install-recommends -q -y --force-yes install openswan
+ apt-get --no-install-recommends -q -y --force-yes install openswan=1:2.6.37-3
# xenstore utils
apt-get --no-install-recommends -q -y --force-yes install xenstore-utils
libxenstore3.0
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2dfd2786/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 587d44d..d085b25 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -59,7 +59,7 @@ install_packages() {
apt-get --no-install-recommends -q -y --force-yes install xl2tpd bcrelay ppp
ipsec-tools tdb-tools
echo "openswan openswan/install_x509_certificate boolean false" |
debconf-set-selections
echo "openswan openswan/install_x509_certificate seen true" |
debconf-set-selections
- apt-get --no-install-recommends -q -y --force-yes install openswan
+ apt-get --no-install-recommends -q -y --force-yes install openswan=1:2.6.37-3
# xenstore utils
apt-get --no-install-recommends -q -y --force-yes install xenstore-utils
libxenstore3.0
git commit: updated refs/heads/master to 2109418
Repository: cloudstack Updated Branches: refs/heads/master dfa607fb4 -> 210941846 Fixed Marvin Issue: Hypervisor value was hardcoded to XenServer while deploying VM if not specified Signed-off-by: Santhosh Edukulla Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21094184 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21094184 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21094184 Branch: refs/heads/master Commit: 2109418469e7434bfc13fce0a20d5464d0b7862f Parents: dfa607f Author: Gaurav Aradhye Authored: Tue Aug 5 14:04:19 2014 +0530 Committer: Santhosh Edukulla Committed: Tue Aug 5 16:04:19 2014 +0530 -- tools/marvin/marvin/lib/base.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21094184/tools/marvin/marvin/lib/base.py -- diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index eb05a18..ddfb8b3 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -354,7 +354,7 @@ class VirtualMachine: projectid=None, startvm=None, diskofferingid=None, affinitygroupnames=None, affinitygroupids=None, group=None, hostid=None, keypair=None, ipaddress=None, mode='default', - method='GET', hypervisor="XenServer", customcpunumber=None, + method='GET', hypervisor=None, customcpunumber=None, customcpuspeed=None, custommemory=None, rootdisksize=None): """Create the instance""" @@ -369,7 +369,10 @@ class VirtualMachine: cmd.zoneid = zoneid elif "zoneid" in services: cmd.zoneid = services["zoneid"] -cmd.hypervisor = hypervisor +if hypervisor: +cmd.hypervisor = hypervisor +elif "hypervisor" in services: +cmd.hypervisor = services["hypervisor"] if "displayname" in services: cmd.displayname = services["displayname"]
git commit: updated refs/heads/hotfix/broken-simulator to 437a158
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/broken-simulator 08978c348 -> 437a15827
It's the template that has the simulator type, not the deploy target.
Remove extra logging to prevent a potential NPE
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/437a1582
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/437a1582
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/437a1582
Branch: refs/heads/hotfix/broken-simulator
Commit: 437a158276cfd46735f5cefd75cbede195df2093
Parents: 08978c3
Author: Hugo Trippaers
Authored: Tue Aug 5 12:31:14 2014 +0200
Committer: Hugo Trippaers
Committed: Tue Aug 5 12:31:14 2014 +0200
--
server/src/com/cloud/vm/UserVmManagerImpl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/437a1582/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index d559050..8e3bd04 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2719,12 +2719,11 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
// Special case for simulator as we need to be able to simulator other
types of hypervisors
HypervisorType hypervisorType = null;
-if (template.getHypervisorType() == null ||
template.getHypervisorType() == HypervisorType.None || hypervisor ==
HypervisorType.Simulator) {
+if (template.getHypervisorType() == null ||
template.getHypervisorType() == HypervisorType.None ||
template.getHypervisorType() == HypervisorType.Simulator) {
hypervisorType = hypervisor;
} else {
if (hypervisor != null && hypervisor != HypervisorType.None &&
hypervisor != template.getHypervisorType()) {
-throw new InvalidParameterValueException("Hypervisor passed to
the deployVm call ( " + hypervisor.toString()
-+ " ), is different from the hypervisor type of the
template ( " + template.getHypervisorType().toString() + " )");
+throw new InvalidParameterValueException("Hypervisor type
passed to the deployVm call is different from the hypervisor type of the
template");
}
hypervisorType = template.getHypervisorType();
}
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [deleted] cc725e53e
git commit: updated refs/heads/master to dfa607f
Repository: cloudstack
Updated Branches:
refs/heads/master cc725e53e -> dfa607fb4
CLOUDSTACK-7250 [vCenter 5.5] SourceNAT,StaticNAT and Portfowrding is not
working with Vmware DVS in vCenter 5.5
Change in vCenter 5.5 API from prior versions forced code change in CloudStack.
Update property value of property "VirtualE1000.deviceInfo.summary" is
accommodated now.
Signed-off-by: Sateesh Chodapuneedi
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dfa607fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfa607fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfa607fb
Branch: refs/heads/master
Commit: dfa607fb443cbd0c3f2c264c2abfa9f1844a16ce
Parents: cc725e5
Author: Sateesh Chodapuneedi
Authored: Tue Aug 5 10:00:00 2014 +0530
Committer: Sateesh Chodapuneedi
Committed: Tue Aug 5 10:00:00 2014 +0530
--
.../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dfa607fb/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
--
diff --git
a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index e8d91f6..e5398af 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -2412,7 +2412,7 @@ public class VirtualMachineMO extends BaseMO {
attachedNetworkSummary =
((VirtualEthernetCard)nic).getDeviceInfo().getSummary();
if (attachedNetworkSummary.startsWith(networkNamePrefix)) {
return new Pair(new Integer(index),
nic);
-} else if
(attachedNetworkSummary.endsWith("DistributedVirtualPortBackingInfo.summary")) {
+} else if
(attachedNetworkSummary.endsWith("DistributedVirtualPortBackingInfo.summary")
|| attachedNetworkSummary.startsWith("DVSwitch")) {
dvPortGroupName = getDvPortGroupName((VirtualEthernetCard)nic);
if (dvPortGroupName != null &&
dvPortGroupName.startsWith(networkNamePrefix)) {
s_logger.debug("Found a dvPortGroup already associated
with public NIC.");
git commit: updated refs/heads/hotfix/broken-simulator to 08978c3
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/broken-simulator 972ff0ce2 -> 08978c348
Improve the error message to see what is going on
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08978c34
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08978c34
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08978c34
Branch: refs/heads/hotfix/broken-simulator
Commit: 08978c348d5655c4560fc61fa73a5b9bb9d12eb3
Parents: 972ff0c
Author: Hugo Trippaers
Authored: Tue Aug 5 11:50:12 2014 +0200
Committer: Hugo Trippaers
Committed: Tue Aug 5 11:50:12 2014 +0200
--
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08978c34/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index b51e8ac..d559050 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2723,7 +2723,8 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
hypervisorType = hypervisor;
} else {
if (hypervisor != null && hypervisor != HypervisorType.None &&
hypervisor != template.getHypervisorType()) {
-throw new InvalidParameterValueException("Hypervisor passed to
the deployVm call, is different from the hypervisor type of the template");
+throw new InvalidParameterValueException("Hypervisor passed to
the deployVm call ( " + hypervisor.toString()
++ " ), is different from the hypervisor type of the
template ( " + template.getHypervisorType().toString() + " )");
}
hypervisorType = template.getHypervisorType();
}
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [created] cc725e53e
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [deleted] 1bfb1f650
git commit: updated refs/heads/master to cc725e5
Repository: cloudstack
Updated Branches:
refs/heads/master 1bfb1f650 -> cc725e53e
Fixing Summary:Coverity findings for brocade-plugin
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cc725e53
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cc725e53
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cc725e53
Branch: refs/heads/master
Commit: cc725e53e304781148a6bf077e05d844fe88207c
Parents: 1bfb1f6
Author: Ritu Sabharwal
Authored: Tue Aug 5 14:59:15 2014 +0530
Committer: Santhosh Edukulla
Committed: Tue Aug 5 14:59:15 2014 +0530
--
.../api/response/BrocadeVcsDeviceResponse.java | 20 +++
.../cloud/network/brocade/BrocadeVcsApi.java| 56 ++--
2 files changed, 61 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc725e53/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
--
diff --git
a/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
b/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
index 60edbcf..43b4e44 100644
---
a/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
+++
b/plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
@@ -51,6 +51,26 @@ public class BrocadeVcsDeviceResponse extends BaseResponse {
@Param(description = "the principal switch Ip address")
private String hostName;
+public String getId() {
+return id;
+}
+
+public String getPhysicalNetworkId() {
+return physicalNetworkId;
+}
+
+public String getProviderName() {
+return providerName;
+}
+
+public String getDeviceName() {
+return deviceName;
+}
+
+public String getHostName() {
+return hostName;
+}
+
public void setId(String vcsDeviceId) {
this.id = vcsDeviceId;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cc725e53/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
--
diff --git
a/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
b/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
index d5f06f8..dc111fd 100644
---
a/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
+++
b/plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
@@ -334,7 +334,15 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() !=
HttpStatus.SC_NO_CONTENT) {
-String errorMessage = responseToErrorMessage(response);
+
+String errorMessage;
+try {
+errorMessage = responseToErrorMessage(response);
+} catch (IOException e) {
+s_logger.error("Failed to update object : " + e.getMessage());
+throw new BrocadeVcsApiException("Failed to update object : "
+ e.getMessage());
+}
+
pm.releaseConnection();
s_logger.error("Failed to update object : " + errorMessage);
throw new BrocadeVcsApiException("Failed to update object : " +
errorMessage);
@@ -405,7 +413,15 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED)
{
-String errorMessage = responseToErrorMessage(response);
+
+String errorMessage;
+try {
+errorMessage = responseToErrorMessage(response);
+} catch (IOException e) {
+s_logger.error("Failed to create object : " + e.getMessage());
+throw new BrocadeVcsApiException("Failed to create object : "
+ e.getMessage());
+}
+
pm.releaseConnection();
s_logger.error("Failed to create object : " + errorMessage);
throw new BrocadeVcsApiException("Failed to create object : " +
errorMessage);
@@ -421,7 +437,6 @@ public class BrocadeVcsApi {
throw new BrocadeVcsApiException("Hostname/credentials are null or
empty");
}
-BufferedReader br = null;
String readLine = null;
StringBuffer sb = null;
@@ -432,14 +447,21 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
-String errorMe
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [created] 1bfb1f650
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [deleted] 912dc15bc
Git Push Summary
Repository: cloudstack Updated Branches: refs/heads/develop [created] 912dc15bc
git commit: updated refs/heads/master to 1bfb1f6
Repository: cloudstack
Updated Branches:
refs/heads/master 912dc15bc -> 1bfb1f650
CLOUDSTACK-7246: corrected script name of createipalias
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1bfb1f65
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1bfb1f65
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1bfb1f65
Branch: refs/heads/master
Commit: 1bfb1f6503167c3de2c01894b32d287a98424dbc
Parents: 912dc15
Author: Jayapal
Authored: Tue Aug 5 14:41:12 2014 +0530
Committer: Jayapal
Committed: Tue Aug 5 14:41:12 2014 +0530
--
.../resource/virtualnetwork/VirtualRoutingResourceTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1bfb1f65/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
--
diff --git
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
index fc1e3f5..aab1e72 100644
---
a/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
+++
b/core/test/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResourceTest.java
@@ -1046,10 +1046,10 @@ public class VirtualRoutingResourceTest implements
VirtualRouterDeployer {
"/opt/cloud/bin/vpc_portforwarding.sh -D -P udp -l 64.1.1.11
-p 8080:8080 -r 10.10.1.11 -d 8080-8080\n" +
"\n" +
"\n" +
-"/opt/cloud/bin/createipAlias.sh
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
+"/opt/cloud/bin/createIpAlias.sh
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
"\n" +
"\n" +
-"/opt/cloud/bin/deleteipAlias.sh
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0--
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
+"/opt/cloud/bin/deleteIpAlias.sh
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0--
1:169.254.3.10:255.255.255.0-2:169.254.3.11:255.255.255.0-3:169.254.3.12:255.255.255.0-\n"
+
"\n" +
"
git commit: updated refs/heads/master to 912dc15
Repository: cloudstack
Updated Branches:
refs/heads/master e4d6cd8e6 -> 912dc15bc
CLOUDSTACK-7246: corrected script name of createipalias
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/912dc15b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/912dc15b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/912dc15b
Branch: refs/heads/master
Commit: 912dc15bc18a2482ff78fd2f1c19bd8e46c98bf1
Parents: e4d6cd8
Author: Jayapal
Authored: Tue Aug 5 14:18:36 2014 +0530
Committer: Jayapal
Committed: Tue Aug 5 14:20:32 2014 +0530
--
core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/912dc15b/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
--
diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
b/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
index 4fd5aa5..7d4253b 100644
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VRScripts.java
@@ -32,8 +32,8 @@ public class VRScripts {
protected static final String FIREWALL_EGRESS = "firewall_egress.sh";
protected static final String FIREWALL_INGRESS = "firewall_ingress.sh";
protected static final String FIREWALL_NAT = "firewall_nat.sh";
-protected static final String IPALIAS_CREATE = "createipAlias.sh";
-protected static final String IPALIAS_DELETE = "deleteipAlias.sh";
+protected static final String IPALIAS_CREATE = "createIpAlias.sh";
+protected static final String IPALIAS_DELETE = "deleteIpAlias.sh";
protected static final String IPASSOC = "ipassoc.sh";
protected static final String LB = "loadbalancer.sh";
protected static final String MONITOR_SERVICE = "monitor_service.sh";
git commit: updated refs/heads/hotfix/4.4-svm-upgrade to 00c2696
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/4.4-svm-upgrade [created] 00c2696e7
upgrade of systemvm templates
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/00c2696e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/00c2696e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/00c2696e
Branch: refs/heads/hotfix/4.4-svm-upgrade
Commit: 00c2696e7a1d1930a4088af6fc085b523b0b3589
Parents: 8608321
Author: Daan Hoogland
Authored: Mon Aug 4 14:12:58 2014 +0200
Committer: Daan Hoogland
Committed: Mon Aug 4 14:12:58 2014 +0200
--
.../com/cloud/upgrade/dao/Upgrade440to441.java | 167 +++
1 file changed, 167 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00c2696e/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
--
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
index 497da8d..f06ceb9 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade440to441.java
@@ -19,9 +19,17 @@ package com.cloud.upgrade.dao;
import java.io.File;
import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
+import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@@ -55,6 +63,165 @@ public class Upgrade440to441 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
+updateSystemVmTemplates(conn);
+}
+
+@SuppressWarnings("serial")
+private void updateSystemVmTemplates(Connection conn) {
+s_logger.debug("Updating System Vm template IDs");
+//Get all hypervisors in use
+Set hypervisorsListInUse = new
HashSet();
+try(PreparedStatement pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
+ResultSet rs = pstmt.executeQuery();
+ ) {
+while(rs.next()){
+switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
+case XenServer:
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
+break;
+case KVM:
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
+break;
+case VMware:
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
+break;
+case Hyperv:
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
+break;
+case LXC:
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+break;
+default: // we don't support system vms on other hypervisors
(yet)
+break;
+}
+}
+} catch (SQLException e) {
+s_logger.error("updateSystemVmTemplates:Exception while getting
hypervisor types from clusters: "+e.getMessage());
+throw new CloudRuntimeException("updateSystemVmTemplates:Exception
while getting hypervisor types from clusters", e);
+}
+
+Map NewTemplateNameList = new
HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.4");
+put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.4");
+put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.4");
+put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.4");
+put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.4");
+}
+};
+
+Map
routerTemplateConfigurationNames = new HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"router.template.xen");
+put(Hypervisor.HypervisorType.VMware,
"router.template.vmware");
+put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
+put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+put(Hypervisor.HypervisorType.Hyperv,
"router.template.hyperv");
+}
+};
+
+Map newTemplateUrl = new
HashMap(){
+{
+put(Hypervisor.HypervisorType.XenServer,
"http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-xen.vhd.bz2";);
+put(Hypervisor.HypervisorType.VMware,
"http://cloudstack.apt-get.eu/systemvm/4.4/sy
git commit: updated refs/heads/hotfix/broken-simulator to 972ff0c
Repository: cloudstack
Updated Branches:
refs/heads/hotfix/broken-simulator [created] 972ff0ce2
Commit 05d056bb broke the simulator run, fixed by excluding the
simulator from the new check
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/972ff0ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/972ff0ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/972ff0ce
Branch: refs/heads/hotfix/broken-simulator
Commit: 972ff0ce20ce7d68dcf03d1922c14a00d76dbfd4
Parents: e4d6cd8
Author: Hugo Trippaers
Authored: Tue Aug 5 09:14:16 2014 +0200
Committer: Hugo Trippaers
Committed: Tue Aug 5 09:14:16 2014 +0200
--
server/src/com/cloud/vm/UserVmManagerImpl.java | 254 ++--
1 file changed, 128 insertions(+), 126 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/972ff0ce/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 05cc183..b51e8ac 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -35,6 +35,9 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.log4j.Logger;
+
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupService;
@@ -84,8 +87,6 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.command.DettachCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -1013,10 +1014,10 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
}
if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
-if (!(network.getGuestType() == Network.GuestType.Shared &&
network.getAclType() == ACLType.Domain)
-&& !(network.getAclType() == ACLType.Account &&
network.getAccountId() == vmInstance.getAccountId())) {
-throw new InvalidParameterValueException("only shared network or
isolated network with the same account_id can be added to vmId: " + vmId);
-}
+if (!(network.getGuestType() == Network.GuestType.Shared &&
network.getAclType() == ACLType.Domain)
+&& !(network.getAclType() == ACLType.Account &&
network.getAccountId() == vmInstance.getAccountId())) {
+throw new InvalidParameterValueException("only shared network
or isolated network with the same account_id can be added to vmId: " + vmId);
+}
}
List allNics = _nicDao.listByVmId(vmInstance.getId());
@@ -1255,7 +1256,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
@Override
@ActionEvent(eventType = EventTypes.EVENT_VM_UPGRADE, eventDescription =
"Upgrading VM", async = true)
public UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws
ResourceUnavailableException, ConcurrentOperationException,
ManagementServerException,
-VirtualMachineMigrationException {
+VirtualMachineMigrationException {
Long vmId = cmd.getId();
Long newServiceOfferingId = cmd.getServiceOfferingId();
@@ -1315,7 +1316,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
@Override
public boolean upgradeVirtualMachine(Long vmId, Long newServiceOfferingId,
Map customParameters) throws ResourceUnavailableException,
-ConcurrentOperationException, ManagementServerException,
VirtualMachineMigrationException {
+ConcurrentOperationException, ManagementServerException,
VirtualMachineMigrationException {
// Verify input parameters
VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId);
@@ -1331,7 +1332,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
}
private boolean upgradeRunningVirtualMachine(Long vmId, Long
newServiceOfferingId, Map customParameters) throws
ResourceUnavailableException,
-ConcurrentOperationException, ManagementServerException,
VirtualMachineMigrationException {
+ConcurrentOperationException, ManagementServerException,
VirtualMachineMigrationException {
Account caller = CallContext.current().getCallingAccount();
VMInstanceV
