From 85505ca755274a47be4379caca2fb53efff2a74f Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 14 Sep 2012 14:48:34 -0700 Subject: [PATCH 001/285] remove README.html in cloud.spec --- cloud.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cloud.spec b/cloud.spec index 724f8577a2e..c1fe56ae7c0 100644 --- a/cloud.spec +++ b/cloud.spec @@ -423,7 +423,6 @@ fi %doc %{_docdir}/%{name}-%{version}/version-info %doc %{_docdir}/%{name}-%{version}/sccs-info %doc %{_docdir}/%{name}-%{version}/configure-info -%doc README.html %doc debian/copyright %files client-ui From 9affeddb34c4bfe0600fd0f08907de97c530f71c Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 14 Sep 2012 14:49:24 -0700 Subject: [PATCH 002/285] remove README.html in deb build --- debian/rules | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/rules b/debian/rules index 5c5ddcbe0a1..8458bfcd678 100755 --- a/debian/rules +++ b/debian/rules @@ -91,7 +91,6 @@ binary-common: dh_testdir dh_testroot dh_installchangelogs - dh_installdocs -A README.html # dh_installexamples # dh_installmenu # dh_installdebconf From eb47a57daa61a7b63b8d746ca9abbe7c9c9d97ea Mon Sep 17 00:00:00 2001 From: Jessica Tomechak Date: Tue, 21 Aug 2012 19:08:28 -0700 Subject: [PATCH 003/285] Promote sections to chapters: Cloud Infrastructure Concepts and Provisioning Steps. --- docs/en-US/cloud-infrastructure-concepts.xml | 4 +-- docs/en-US/cloudstack.xml | 5 ++-- docs/en-US/provisioning-steps.xml | 5 ++-- docs/en-US/provisioning.xml | 29 -------------------- 4 files changed, 7 insertions(+), 36 deletions(-) delete mode 100644 docs/en-US/provisioning.xml diff --git a/docs/en-US/cloud-infrastructure-concepts.xml b/docs/en-US/cloud-infrastructure-concepts.xml index 58f8844c826..7fc9efa3b3d 100644 --- a/docs/en-US/cloud-infrastructure-concepts.xml +++ b/docs/en-US/cloud-infrastructure-concepts.xml @@ -22,7 +22,7 @@ under the License. --> -
+ Cloud Infrastructure Concepts @@ -31,4 +31,4 @@ -
+ \ No newline at end of file diff --git a/docs/en-US/cloudstack.xml b/docs/en-US/cloudstack.xml index c18bc194cfe..65375506e73 100644 --- a/docs/en-US/cloudstack.xml +++ b/docs/en-US/cloudstack.xml @@ -23,11 +23,12 @@ --> - + - + + diff --git a/docs/en-US/provisioning-steps.xml b/docs/en-US/provisioning-steps.xml index e553d3c5f54..3febc814035 100644 --- a/docs/en-US/provisioning-steps.xml +++ b/docs/en-US/provisioning-steps.xml @@ -22,7 +22,7 @@ under the License. --> -
+ Steps to Provisioning Your Cloud Infrastructure This section tells how to add zones, pods, clusters, hosts, storage, and networks to your cloud. If you are unfamiliar with these entities, please begin by looking through . @@ -34,5 +34,4 @@ - -
+ diff --git a/docs/en-US/provisioning.xml b/docs/en-US/provisioning.xml deleted file mode 100644 index 8a5b44af8e5..00000000000 --- a/docs/en-US/provisioning.xml +++ /dev/null @@ -1,29 +0,0 @@ - - -%BOOK_ENTITIES; -]> - - - - - Provisioning Your Cloud Infrastructure - - - From b33203a3d08e810c24731f73a7a9fead7dad6270 Mon Sep 17 00:00:00 2001 From: Jessica Tomechak Date: Tue, 21 Aug 2012 19:10:24 -0700 Subject: [PATCH 004/285] Change the setting for how many doc sections are grouped in each html file. --- docs/publican-all.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/publican-all.cfg b/docs/publican-all.cfg index 89e1d304320..d338738f296 100644 --- a/docs/publican-all.cfg +++ b/docs/publican-all.cfg @@ -24,4 +24,4 @@ type: Book docname: cloudstack brand: cloudstack chunk_first: 1 -chunk_section_depth: 2 +chunk_section_depth: 1 From 7fa4d4329871702d998a69690512b996837231db Mon Sep 17 00:00:00 2001 From: Jessica Tomechak Date: Mon, 17 Sep 2012 18:07:45 -0700 Subject: [PATCH 005/285] New book info file for all-inclusive documentation build. --- docs/en-US/Book_Info_Build_All.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 docs/en-US/Book_Info_Build_All.xml diff --git a/docs/en-US/Book_Info_Build_All.xml b/docs/en-US/Book_Info_Build_All.xml new file mode 100644 index 00000000000..f2cece34730 --- /dev/null +++ b/docs/en-US/Book_Info_Build_All.xml @@ -0,0 +1,25 @@ + + +%BOOK_ENTITIES; +]> + + CloudStack Guide + Revised August 21, 2012 5:48 pm Pacific + Apache CloudStack (incubating) + 3.0 + 1 + + + Complete technical documentation for Apache CloudStack. + + + + + + + + + + + From cf5d7f879fca32d79fbbc58072d3a40b9620b1d1 Mon Sep 17 00:00:00 2001 From: Mice Xia Date: Tue, 18 Sep 2012 09:51:23 +0800 Subject: [PATCH 006/285] CLOUDSTACK-115 UI - Currently there is no way an User can specify network domain suffix to an Isolated Guest Network on the UI. --- ui/scripts/network.js | 51 ++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 1a7769a42cb..c6acc750b09 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -311,6 +311,7 @@ dependsOn: 'networkOfferingId', select: function(args) { var networkOfferingObj; + var $form = args.$select.closest('form'); $(networkOfferingObjs).each(function(key, value) { if(value.id == args.networkOfferingId) { networkOfferingObj = value; @@ -338,40 +339,50 @@ args.response.success({ data: data }); } }); + $form.find('.form-item[rel=networkDomain]').hide(); } else { args.$select.closest('.form-item').hide(); + $form.find('.form-item[rel=networkDomain]').show(); args.response.success({ data: null }); } } }, guestGateway: { label: 'label.guest.gateway' }, - guestNetmask: { label: 'label.guest.netmask' } + guestNetmask: { label: 'label.guest.netmask' }, + networkDomain: { label: 'label.network.domain' } } }, action: function(args) { - var dataObj = { - zoneId: args.data.zoneId, - name: args.data.name, - displayText: args.data.displayText, - networkOfferingId: args.data.networkOfferingId - }; + var dataObj = { + zoneId: args.data.zoneId, + name: args.data.name, + displayText: args.data.displayText, + networkOfferingId: args.data.networkOfferingId + }; + if(args.data.guestGateway != null && args.data.guestGateway.length > 0) { - $.extend(dataObj, { - gateway: args.data.guestGateway - }); - } + $.extend(dataObj, { + gateway: args.data.guestGateway + }); + } if(args.data.guestNetmask != null && args.data.guestNetmask.length > 0) { - $.extend(dataObj, { - netmask: args.data.guestNetmask - }); - } - if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") { - $.extend(dataObj, { - vpcid: args.data.vpcid - }); - } + $.extend(dataObj, { + netmask: args.data.guestNetmask + }); + } + if(args.$form.find('.form-item[rel=vpcid]').css("display") != "none") { + $.extend(dataObj, { + vpcid: args.data.vpcid + }); + } + if(args.data.networkDomain != null && args.data.networkDomain.length > 0 && args.$form.find('.form-item[rel=vpcid]').css("display") == "none") { + $.extend(dataObj, { + networkDomain: args.data.networkDomain + }); + } + $.ajax({ url: createURL('createNetwork'), data: dataObj, From 11b42481e1ed5aea2cc971a49fa9bcb357d8b64f Mon Sep 17 00:00:00 2001 From: Mice Xia Date: Tue, 18 Sep 2012 11:02:14 +0800 Subject: [PATCH 007/285] CLOUDSTACK-114 UI - VPC related Network Offerings should not be provided as options to create a guest network for the Account before a VPC is actually present with the Account --- ui/scripts/network.js | 45 ++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index c6acc750b09..e1c32b4b5b9 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -282,25 +282,40 @@ label: 'label.network.offering', validation: { required: true }, dependsOn: 'zoneId', - select: function(args) { + select: function(args) { $.ajax({ - url: createURL('listNetworkOfferings&zoneid=' + args.zoneId), + url: createURL('listVPCs'), data: { - guestiptype: 'Isolated', - supportedServices: 'SourceNat', - specifyvlan: false, - state: 'Enabled' + listAll: true }, success: function(json) { - networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; - args.response.success({ - data: $.map(networkOfferingObjs, function(zone) { - return { - id: zone.id, - description: zone.name - }; - }) - }); + var items = json.listvpcsresponse.vpc; + var baseUrl = 'listNetworkOfferings&zoneid=' + args.zoneId; + var listUrl; + if(items != null && items.length > 0) + listUrl = baseUrl; + else + listUrl = baseUrl + '&forVpc=false'; + $.ajax({ + url: createURL(listUrl), + data: { + guestiptype: 'Isolated', + supportedServices: 'SourceNat', + specifyvlan: false, + state: 'Enabled' + }, + success: function(json) { + networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; + args.response.success({ + data: $.map(networkOfferingObjs, function(zone) { + return { + id: zone.id, + description: zone.name + }; + }) + }); + } + }); } }); } From 955cbd97bc239c93f9e5c5f3953d0ced1d17e405 Mon Sep 17 00:00:00 2001 From: Mice Xia Date: Tue, 18 Sep 2012 11:11:13 +0800 Subject: [PATCH 008/285] CLOUDSTACK-10 Deleting a disconnected primary storage results in partial removed state --- server/src/com/cloud/storage/StorageManagerImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 83b2846f2c8..fc6fb5bfa60 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1503,7 +1503,10 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag s_logger.warn("Unable to find pool:" + id); throw new InvalidParameterValueException("Unable to find pool by id " + id); } - + if(sPool.getStatus() != StoragePoolStatus.Maintenance){ + s_logger.warn("Unable to delete storage id: " + id +" due to it is not in Maintenance state"); + throw new InvalidParameterValueException("Unable to delete storage due to it is not in Maintenance state, id: " + id); + } if (sPool.getPoolType().equals(StoragePoolType.LVM) || sPool.getPoolType().equals(StoragePoolType.EXT)) { s_logger.warn("Unable to delete local storage id:" + id); throw new InvalidParameterValueException("Unable to delete local storage id: " + id); @@ -1545,8 +1548,6 @@ public class StorageManagerImpl implements StorageManager, Manager, ClusterManag // mark storage pool as removed (so it can't be used for new volumes creation), release the lock boolean isLockReleased = false; - sPool.setStatus(StoragePoolStatus.Removed); - _storagePoolDao.update(id, sPool); isLockReleased = _storagePoolDao.releaseFromLockTable(lock.getId()); s_logger.trace("Released lock for storage pool " + id); From d66f2077d1552d2bad1cacb2465faebd8f4c0e35 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Tue, 18 Sep 2012 11:08:41 -0700 Subject: [PATCH 009/285] CLOUDSTACK-98: Fix alignment of project dashboard event rows --- ui/css/cloudstack3.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index dfd4b1677d9..fd970c41f61 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -6,9 +6,9 @@ * 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 @@ -8611,6 +8611,9 @@ div.panel.ui-dialog div.list-view div.fixed-header { position: relative; left: 5px; top: 8px; + display: inline-block; + padding-bottom: 13px; + max-width: 171px; } .info-boxes .info-box ul li .total span { @@ -10386,5 +10389,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it .label-hovered { cursor: pointer; - color: blue !important; + color: #0000FF !important; } + From a5f13012d6b77d6f93bd56cf3d4940e755666a04 Mon Sep 17 00:00:00 2001 From: Jessica Tomechak Date: Tue, 18 Sep 2012 11:10:21 -0700 Subject: [PATCH 010/285] Add license header to doc file. --- docs/en-US/Book_Info_Build_All.xml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/docs/en-US/Book_Info_Build_All.xml b/docs/en-US/Book_Info_Build_All.xml index f2cece34730..7243149ee20 100644 --- a/docs/en-US/Book_Info_Build_All.xml +++ b/docs/en-US/Book_Info_Build_All.xml @@ -1,11 +1,30 @@ - %BOOK_ENTITIES; ]> + + + CloudStack Guide - Revised August 21, 2012 5:48 pm Pacific + Revised September 18, 2012 10:48 am Pacific Apache CloudStack (incubating) 3.0 1 From 2abeac11c7b6b8344a80f735838ef1a611b09fab Mon Sep 17 00:00:00 2001 From: Edison Su Date: Tue, 18 Sep 2012 11:39:43 -0700 Subject: [PATCH 011/285] fix mvn install: org.apache.xalan doesn't work --- awsapi/pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/awsapi/pom.xml b/awsapi/pom.xml index d4dfae0983e..66cf974cb32 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -100,6 +100,10 @@ bouncycastle bcprov-jdk14 + + org.apache.xalan + xalan + @@ -112,6 +116,10 @@ bouncycastle bcprov-jdk14 + + org.apache.xalan + xalan + @@ -119,18 +127,36 @@ rampart-core ${cs.rampart.version} runtime + + + org.apache.xalan + xalan + + org.apache.rampart rampart-policy ${cs.rampart.version} runtime + + + org.apache.xalan + xalan + + org.apache.rampart rampart-trust ${cs.rampart.version} runtime + + + org.apache.xalan + xalan + + org.slf4j From 93c84c829134f71f80c560468af8bb32afab8164 Mon Sep 17 00:00:00 2001 From: Brian Federle Date: Tue, 18 Sep 2012 14:18:48 -0700 Subject: [PATCH 012/285] CLOUDSTACK-85: Fix instance wizard review hypervisor Fix hypervisor type not being shown in instance wizard review step --- ui/index.jsp | 3 ++ ui/scripts/ui-custom/instanceWizard.js | 64 ++++++++++++++++++-------- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/ui/index.jsp b/ui/index.jsp index a81dcb3c5f0..74a6f6d4b8c 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -136,6 +136,9 @@ under the License.
    • + + +