(cloudstack) branch main updated: framework/config: make logic in ::value() defensive (#9108)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 2a63483b4c5 framework/config: make logic in ::value() defensive (#9108)
2a63483b4c5 is described below
commit 2a63483b4c5f234fa441cb5a5477aa59c9e196ee
Author: Rohit Yadav
AuthorDate: Wed May 22 20:20:15 2024 +0530
framework/config: make logic in ::value() defensive (#9108)
This adds a NPE check on the s_depot.global() which can cause NPE in
case of unit tests, where s_depot is not null but the underlying config
dao is null (not mocked or initialised) via `s_depot.global()` becomes
null.
This reverts commit 5f73172bcbe975e4ef416e525dc95bad63fa6d3a.
Signed-off-by: Rohit Yadav
---
.../main/java/org/apache/cloudstack/framework/config/ConfigKey.java | 2 +-
.../framework/config/ConfigKeyScheduledExecutionWrapperTest.java | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java
b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java
index df93f78fa83..46923de3c7c 100644
---
a/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java
+++
b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java
@@ -211,7 +211,7 @@ public class ConfigKey {
public T value() {
if (_value == null || isDynamic()) {
-ConfigurationVO vo = s_depot != null ?
s_depot.global().findById(key()) : null;
+ConfigurationVO vo = (s_depot != null && s_depot.global() != null)
? s_depot.global().findById(key()) : null;
final String value = (vo != null && vo.getValue() != null) ?
vo.getValue() : defaultValue();
_value = ((value == null) ? (T)defaultValue() : valueOf(value));
}
diff --git
a/framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
b/framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
index 0eb2f6286ca..fbb4dc24fca 100644
---
a/framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
+++
b/framework/config/src/test/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapperTest.java
@@ -20,7 +20,6 @@ import com.cloud.utils.concurrency.NamedThreadFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import java.util.concurrent.Executors;
@@ -59,8 +58,8 @@ public class ConfigKeyScheduledExecutionWrapperTest {
@Test(expected = IllegalArgumentException.class)
public void invalidConfigKeyTest() {
TestRunnable runnable = new TestRunnable();
-ConfigKey configKey = Mockito.mock(ConfigKey.class);
-when(configKey.value()).thenReturn("test");
+ConfigKey configKey = new ConfigKey<>(String.class, "test",
"test", "test", "test", true,
+ConfigKey.Scope.Global, null, null, null, null, null,
ConfigKey.Kind.CSV, null);
ConfigKeyScheduledExecutionWrapper runner = new
ConfigKeyScheduledExecutionWrapper(executorService, runnable, configKey,
TimeUnit.SECONDS);
}
(cloudstack-cloudmonkey) branch signature-bugfix deleted (was bd8e60f)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch signature-bugfix in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git was bd8e60f network: when using API key & secret key drop params The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack-cloudmonkey) branch main updated: network: when using API key & secret key drop params (#150)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git
The following commit(s) were added to refs/heads/main by this push:
new 1f45761 network: when using API key & secret key drop params (#150)
1f45761 is described below
commit 1f4576196fd09f0e5577ae01da3c93e148e4684c
Author: Rohit Yadav
AuthorDate: Mon May 20 15:50:51 2024 +0530
network: when using API key & secret key drop params (#150)
Params need to be dropped as apikey & secretkey based URL has all the
params and it causes signature validation issues when the same params
are also posted again. For example, add host API with username, password
params.
Signed-off-by: Rohit Yadav
---
cmd/network.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmd/network.go b/cmd/network.go
index af97740..b5f4bef 100644
--- a/cmd/network.go
+++ b/cmd/network.go
@@ -221,6 +221,7 @@ func NewAPIRequest(r *Request, api string, args []string,
isAsync bool) (map[str
mac.Write([]byte(strings.ToLower(encodedParams)))
signature := base64.StdEncoding.EncodeToString(mac.Sum(nil))
encodedParams = encodedParams + fmt.Sprintf("=%s",
url.QueryEscape(signature))
+ params = nil
} else if len(r.Config.ActiveProfile.Username) > 0 &&
len(r.Config.ActiveProfile.Password) > 0 {
sessionKey, err := Login(r)
if err != nil {
(cloudstack) branch 4.19 updated: ui: fix limit format (#9060)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.19 by this push: new f0df8d7831a ui: fix limit format (#9060) f0df8d7831a is described below commit f0df8d7831ae13f8ef8411dfbaae12041e4590bc Author: Abhishek Kumar AuthorDate: Mon May 20 14:45:01 2024 +0530 ui: fix limit format (#9060) An undefined variable `item` was used. Signed-off-by: Abhishek Kumar --- ui/src/views/dashboard/UsageDashboard.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/views/dashboard/UsageDashboard.vue b/ui/src/views/dashboard/UsageDashboard.vue index e9edd0cfb6e..fe835cbd0d0 100644 --- a/ui/src/views/dashboard/UsageDashboard.vue +++ b/ui/src/views/dashboard/UsageDashboard.vue @@ -202,7 +202,7 @@ @@ -238,7 +238,7 @@ @@ -274,7 +274,7 @@
(cloudstack-kubernetes-provider) branch main updated: List virtual machines with details=min,nics (#60)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/cloudstack-kubernetes-provider.git
The following commit(s) were added to refs/heads/main by this push:
new 910f5581 List virtual machines with details=min,nics (#60)
910f5581 is described below
commit 910f558153c1bb0f5068f5e17ff8dd0b7aebd7fd
Author: Wei Zhou
AuthorDate: Mon May 20 09:13:49 2024 +0200
List virtual machines with details=min,nics (#60)
---
cloudstack_loadbalancer.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/cloudstack_loadbalancer.go b/cloudstack_loadbalancer.go
index 1859da7d..8c7ef197 100644
--- a/cloudstack_loadbalancer.go
+++ b/cloudstack_loadbalancer.go
@@ -354,6 +354,7 @@ func (cs *CSCloud) verifyHosts(nodes []*corev1.Node)
([]string, string, error) {
p := cs.client.VirtualMachine.NewListVirtualMachinesParams()
p.SetListall(true)
+ p.SetDetails([]string{"min", "nics"})
if cs.projectID != "" {
p.SetProjectid(cs.projectID)
(cloudstack-kubernetes-provider) branch list-vm-details deleted (was 65e63f47)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch list-vm-details in repository https://gitbox.apache.org/repos/asf/cloudstack-kubernetes-provider.git was 65e63f47 List virtual machines with details=min,nics The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack-go) tag v2.16.1 created (now 2b21240)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to tag v2.16.1 in repository https://gitbox.apache.org/repos/asf/cloudstack-go.git at 2b21240 (commit) No new revisions were added by this update.
(cloudstack) branch 4.18 updated: ui: change reporting link to Github Discussions (#9023)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new c791c138e75 ui: change reporting link to Github Discussions (#9023)
c791c138e75 is described below
commit c791c138e75649b604d42f56d7d185a34fe30ce3
Author: Rohit Yadav
AuthorDate: Fri May 10 23:41:37 2024 +0530
ui: change reporting link to Github Discussions (#9023)
* ui: change reporting link to Github Discussions
Many users are using the footer link to open questions about CloudStack
that are usually discussed on the users@ mailing list. This fixes that
behaviour by diverting them to Github Discussions which are linked with
the user@ ML, smart users can still report actual bugs/issues via the
issues tab.
Signed-off-by: Rohit Yadav
* Update en.json
-
Signed-off-by: Rohit Yadav
---
ui/public/locales/en.json | 2 +-
ui/src/components/page/GlobalFooter.vue | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index b11a8f864fb..d7e3c51c1ea 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -1613,7 +1613,7 @@
"label.removing": "Removing",
"label.replace.acl": "Replace ACL",
"label.replace.acl.list": "Replace ACL list",
-"label.report.bug": "Report issue",
+"label.report.bug": "Ask a question or Report an issue",
"label.required": "Required",
"label.requireshvm": "HVM",
"label.requiresupgrade": "Requires upgrade",
diff --git a/ui/src/components/page/GlobalFooter.vue
b/ui/src/components/page/GlobalFooter.vue
index 86c8948e564..854cecc78ac 100644
--- a/ui/src/components/page/GlobalFooter.vue
+++ b/ui/src/components/page/GlobalFooter.vue
@@ -23,7 +23,7 @@
CloudStack {{ $store.getters.features.cloudstackversion }}
- https://github.com/apache/cloudstack/issues/new;
target="_blank">
+ https://github.com/apache/cloudstack/discussions;
target="_blank">
{{ $t('label.report.bug') }}
(cloudstack-csbench) branch main updated: csbench: bump default sync api timeout to 300s/5mins same as async ones
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-csbench.git
The following commit(s) were added to refs/heads/main by this push:
new 5b36954 csbench: bump default sync api timeout to 300s/5mins same as
async ones
5b36954 is described below
commit 5b369544241e54f44e733e7eca3e274c25ed0269
Author: Rohit Yadav
AuthorDate: Fri May 10 20:00:47 2024 +0530
csbench: bump default sync api timeout to 300s/5mins same as async ones
Signed-off-by: Rohit Yadav
---
csbench.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/csbench.go b/csbench.go
index a6e2ed7..72c98a5 100644
--- a/csbench.go
+++ b/csbench.go
@@ -313,6 +313,7 @@ func executeVMAction(vmAction *string, workers *int)
map[string][]*Result {
for _, profile := range profiles {
if profile.Name == "admin" {
cs = cloudstack.NewAsyncClient(config.URL,
profile.ApiKey, profile.SecretKey, false)
+ cs.Timeout(time.Duration(300 * time.Second))
}
}
(cloudstack-csbench) branch main updated: network: bypass vlan warning when creating shared networks
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-csbench.git
The following commit(s) were added to refs/heads/main by this push:
new 73348c3 network: bypass vlan warning when creating shared networks
73348c3 is described below
commit 73348c3b0cf8736ba6204b83db700eb9abdb103a
Author: Rohit Yadav
AuthorDate: Fri May 10 19:49:21 2024 +0530
network: bypass vlan warning when creating shared networks
This ensure the createNetwork APIs don't fail when creating shared
networks using random VLANs which are bound to conflict in a large
env.
Signed-off-by: Rohit Yadav
---
network/network.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/network/network.go b/network/network.go
index c6d5f36..ceb995e 100644
--- a/network/network.go
+++ b/network/network.go
@@ -70,6 +70,7 @@ func CreateNetwork(cs *cloudstack.CloudStackClient, domainId
string, count int)
p.SetStartip(startIP)
p.SetEndip(endIP)
p.SetVlan(strconv.Itoa(getRandomVlan()))
+ p.SetBypassvlanoverlapcheck(true)
resp, err := cs.Network.CreateNetwork(p)
if err != nil {
(cloudstack) branch main updated: Fix exceeding of resource limits with powerflex (#9008)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 21af134087a Fix exceeding of resource limits with powerflex (#9008)
21af134087a is described below
commit 21af134087a55c044f921b3f6ab64aba83b80071
Author: Vishesh
AuthorDate: Wed May 8 20:55:19 2024 +0530
Fix exceeding of resource limits with powerflex (#9008)
* Fix exceeding of resource limits with powerflex
* Add e2e tests
* Update server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
Co-authored-by: Suresh Kumar Anaparti
* fixup
-
Co-authored-by: Suresh Kumar Anaparti
---
.../java/com/cloud/user/ResourceLimitService.java | 2 +
.../service/VolumeOrchestrationService.java| 3 +-
.../api/storage/PrimaryDataStoreDriver.java| 16 +++
.../com/cloud/vm/VirtualMachineManagerImpl.java| 3 +-
.../engine/orchestration/VolumeOrchestrator.java | 50 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 10 ++
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 33 +++
.../resourcelimit/ResourceLimitManagerImpl.java| 13 +++
.../com/cloud/storage/VolumeApiServiceImpl.java| 18
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 107 +
.../java/com/cloud/vm/UserVmManagerImplTest.java | 34 +++
.../cloud/vpc/MockResourceLimitManagerImpl.java| 6 ++
.../component/test_resource_limit_tags.py | 44 +
test/integration/smoke/test_restore_vm.py | 91 +++---
tools/marvin/marvin/lib/base.py| 20 +++-
15 files changed, 390 insertions(+), 60 deletions(-)
diff --git a/api/src/main/java/com/cloud/user/ResourceLimitService.java
b/api/src/main/java/com/cloud/user/ResourceLimitService.java
index d0aa9f69f84..ba19719ea8d 100644
--- a/api/src/main/java/com/cloud/user/ResourceLimitService.java
+++ b/api/src/main/java/com/cloud/user/ResourceLimitService.java
@@ -243,6 +243,8 @@ public interface ResourceLimitService {
void checkVolumeResourceLimitForDiskOfferingChange(Account owner, Boolean
display, Long currentSize, Long newSize,
DiskOffering currentOffering, DiskOffering newOffering) throws
ResourceAllocationException;
+void checkPrimaryStorageResourceLimit(Account owner, Boolean display, Long
size, DiskOffering diskOffering) throws ResourceAllocationException;
+
void incrementVolumeResourceCount(long accountId, Boolean display, Long
size, DiskOffering diskOffering);
void decrementVolumeResourceCount(long accountId, Boolean display, Long
size, DiskOffering diskOffering);
diff --git
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
index c3525466ce1..7950dda4d68 100644
---
a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
+++
b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/VolumeOrchestrationService.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.cloud.exception.ResourceAllocationException;
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
@@ -126,7 +127,7 @@ public interface VolumeOrchestrationService {
void prepareForMigration(VirtualMachineProfile vm, DeployDestination dest);
-void prepare(VirtualMachineProfile vm, DeployDestination dest) throws
StorageUnavailableException, InsufficientStorageCapacityException,
ConcurrentOperationException, StorageAccessException;
+void prepare(VirtualMachineProfile vm, DeployDestination dest) throws
StorageUnavailableException, InsufficientStorageCapacityException,
ConcurrentOperationException, StorageAccessException,
ResourceAllocationException;
boolean canVmRestartOnAnotherServer(long vmId);
diff --git
a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
index 2c7d3c60278..dbe67e6cca5 100644
---
a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
+++
b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
@@ -157,4 +157,20 @@ public interface PrimaryDataStoreDriver extends
DataStoreDriver {
default boolean zoneWideVolumesAvailableWithoutClusterMotion() {
return false
(cloudstack) branch 4.19 updated: Fix message publish in transaction (#8980)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 6b4955affe9 Fix message publish in transaction (#8980)
6b4955affe9 is described below
commit 6b4955affe9f9658eb8128b3b7d18f08a1f05752
Author: Vishesh
AuthorDate: Tue May 7 13:27:31 2024 +0530
Fix message publish in transaction (#8980)
* Fix message publish in transaction
* Resolve comments
---
.../cloud/configuration/ConfigurationManager.java | 3 ++-
.../engine/orchestration/NetworkOrchestrator.java | 30 +-
.../configuration/ConfigurationManagerImpl.java| 17
.../cloud/vpc/MockConfigurationManagerImpl.java| 5 ++--
4 files changed, 40 insertions(+), 15 deletions(-)
diff --git
a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
index 0232d07b8be..728511ba8d5 100644
---
a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
+++
b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
@@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.cloud.dc.VlanVO;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO;
@@ -189,7 +190,7 @@ public interface ConfigurationManager {
* @param caller TODO
* @return success/failure
*/
-boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account
caller);
+VlanVO deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account
caller);
void checkZoneAccess(Account caller, DataCenter zone);
diff --git
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index c49a0fd09b1..09500051df6 100644
---
a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++
b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -255,6 +255,8 @@ import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao;
import com.googlecode.ipv6.IPv6Address;
+import static
com.cloud.configuration.ConfigurationManager.MESSAGE_DELETE_VLAN_IP_RANGE_EVENT;
+
/**
* NetworkManagerImpl implements NetworkManager.
*/
@@ -3298,16 +3300,16 @@ public class NetworkOrchestrator extends ManagerBase
implements NetworkOrchestra
final NetworkVO networkFinal = network;
try {
-Transaction.execute(new TransactionCallbackNoReturn() {
+final List deletedVlanRangeToPublish =
Transaction.execute(new TransactionCallback>() {
@Override
-public void doInTransactionWithoutResult(final
TransactionStatus status) {
+public List doInTransaction(TransactionStatus
status) {
final NetworkGuru guru =
AdapterBase.getAdapterByName(networkGurus, networkFinal.getGuruName());
if (!guru.trash(networkFinal,
_networkOfferingDao.findById(networkFinal.getNetworkOfferingId( {
throw new CloudRuntimeException("Failed to trash
network.");
}
-
-if (!deleteVlansInNetwork(networkFinal,
context.getCaller().getId(), callerAccount)) {
+Pair> deletedVlans =
deleteVlansInNetwork(networkFinal, context.getCaller().getId(), callerAccount);
+if (!deletedVlans.first()) {
s_logger.warn("Failed to delete network " +
networkFinal + "; was unable to cleanup corresponding ip ranges");
throw new CloudRuntimeException("Failed to delete
network " + networkFinal + "; was unable to cleanup corresponding ip ranges");
} else {
@@ -3341,8 +3343,10 @@ public class NetworkOrchestrator extends ManagerBase
implements NetworkOrchestra
_resourceLimitMgr.decrementResourceCount(networkFinal.getAccountId(),
ResourceType.network, networkFinal.getDisplayNetwork());
}
}
+return deletedVlans.second();
}
});
+publishDeletedVlanRanges(deletedVlanRangeToPublish);
if (_networksDao.findById(network.getId()) == null) {
// remove its related ACL permission
final Pair, Long> netw
(cloudstack-www) 01/01: Merge pull request #211 from apache/staging-site
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git commit 6273afb77d531536b4d535ce7fc77a173bca0e71 Merge: 1ad86675 c2627940 Author: Rohit Yadav AuthorDate: Tue May 7 13:03:42 2024 +0530 Merge pull request #211 from apache/staging-site Merge main LICENSE | 2 +- docusaurus.config.js | 2 +- src/pages/users.mdx | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
(cloudstack-www) branch main updated (1ad86675 -> 6273afb7)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from 1ad86675 Update .asf.yaml add 6b63f9c0 Update users.mdx (#210) add c2627940 Use dynamic `year` for `Copyright` in `docusaurus.config.js` (#193) new 6273afb7 Merge pull request #211 from apache/staging-site The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE | 2 +- docusaurus.config.js | 2 +- src/pages/users.mdx | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
(cloudstack-www) branch main updated: Update .asf.yaml
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/main by this push: new 1ad86675 Update .asf.yaml 1ad86675 is described below commit 1ad8667571e198a56aa8e4f3adfec5236f55c8ba Author: Rohit Yadav AuthorDate: Tue May 7 13:03:19 2024 +0530 Update .asf.yaml --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index b437db98..c337df1b 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -30,7 +30,7 @@ github: - hosting enabled_merge_buttons: squash: true -merge: false +merge: true rebase: false protected_branches: ~
(cloudstack-www) branch staging-site updated: Use dynamic `year` for `Copyright` in `docusaurus.config.js` (#193)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch staging-site
in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git
The following commit(s) were added to refs/heads/staging-site by this push:
new c2627940 Use dynamic `year` for `Copyright` in `docusaurus.config.js`
(#193)
c2627940 is described below
commit c26279404cf412aaf7e19bcc1cf7c0d8d1f2cf7f
Author: John Bampton
AuthorDate: Tue May 7 17:32:00 2024 +1000
Use dynamic `year` for `Copyright` in `docusaurus.config.js` (#193)
* Use dynamic `year` for `Copyright` in `docusaurus.config.js`
Also update the main license to 2024
Example seen here:
https://docusaurus.io/docs/api/docusaurus-config#themeConfig
* Update docusaurus.config.js
* Update docusaurus.config.js
* Update docusaurus.config.js
-
Co-authored-by: Rohit Yadav
---
LICENSE | 2 +-
docusaurus.config.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LICENSE b/LICENSE
index 5144feee..60266c64 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013 - 2021 The Apache Software Foundation
+Copyright (c) 2013 - 2024 The Apache Software Foundation
Apache License
diff --git a/docusaurus.config.js b/docusaurus.config.js
index 87613953..ea750060 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -252,7 +252,7 @@ const config = {
-Copyright © 2023 The Apache
+Copyright © 2012 - ${new
Date().getFullYear()} The Apache
Software Foundation, Licensed under the Apache License, Version 2.0.
“Apache”, “CloudStack”, “Apache CloudStack”, the Apache CloudStack logo,
the Apache CloudStack Cloud Monkey logo and the Apache feather logos
(cloudstack-www) branch staging-site updated: Update users.mdx (#210)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/staging-site by this push: new 6b63f9c0 Update users.mdx (#210) 6b63f9c0 is described below commit 6b63f9c040e7ee7fa5b39b0c070fad33d78f816c Author: sunandob <115917371+sunan...@users.noreply.github.com> AuthorDate: Tue May 7 12:59:57 2024 +0530 Update users.mdx (#210) We have added 2 of our entities extensively using Cloudstack Apiculus - Leading platform for Cloudstack-based clouds. Operating 28 cloud regions in 17 countries. Roket Cloud - Cloudstack-based CSP in India. Operated by Apiculus. --- src/pages/users.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/users.mdx b/src/pages/users.mdx index 23efe73b..322415e5 100644 --- a/src/pages/users.mdx +++ b/src/pages/users.mdx @@ -17,6 +17,7 @@ add or remove your organisation. You may also write your concerns to our users mailing list us...@cloudstack.apache.org. - [ActOnMagic](http://www.actonmagic.com) +- [Apiculus](https://apiculus.com) - [Appcore](http://www.appcore.com) - [AxiomIO](http://axiomio.com) - [Ayaline](http://www.ayaline.com) @@ -55,6 +56,7 @@ mailing list us...@cloudstack.apache.org. - [Polcom](http://polcom.com.pl) - [Reliable Networks](http://www.reliablenetworks.com) - [Redbridge](http://www.redbridge.se) +- [Roket Cloud] (https://roket.cloud) - [SafeSwiss Cloud](https://www.safeswisscloud.ch) - [HIAG Data AG](https://www.hiagdata.com) - [SJC Inc](http://www.sjcloud.cn/index.xhtml)
(cloudstack-cloudmonkey) branch signature-bugfix created (now bd8e60f)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch signature-bugfix in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git at bd8e60f network: when using API key & secret key drop params This branch includes the following new commits: new bd8e60f network: when using API key & secret key drop params The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(cloudstack-cloudmonkey) 01/01: network: when using API key & secret key drop params
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch signature-bugfix
in repository https://gitbox.apache.org/repos/asf/cloudstack-cloudmonkey.git
commit bd8e60f4da54df6542e134bbfd0404b9b94dc89b
Author: Rohit Yadav
AuthorDate: Sat May 4 18:11:23 2024 +0530
network: when using API key & secret key drop params
Params need to be dropped as apikey & secretkey based URL has all the
params and it causes signature validation issues when the same params
are also posted again. For example, add host API with username, password
params.
Signed-off-by: Rohit Yadav
---
cmd/network.go | 1 +
1 file changed, 1 insertion(+)
diff --git a/cmd/network.go b/cmd/network.go
index af97740..b5f4bef 100644
--- a/cmd/network.go
+++ b/cmd/network.go
@@ -221,6 +221,7 @@ func NewAPIRequest(r *Request, api string, args []string,
isAsync bool) (map[str
mac.Write([]byte(strings.ToLower(encodedParams)))
signature := base64.StdEncoding.EncodeToString(mac.Sum(nil))
encodedParams = encodedParams + fmt.Sprintf("=%s",
url.QueryEscape(signature))
+ params = nil
} else if len(r.Config.ActiveProfile.Username) > 0 &&
len(r.Config.ActiveProfile.Password) > 0 {
sessionKey, err := Login(r)
if err != nil {
(cloudstack) branch dependabot/npm_and_yarn/ui/multi-0bda765b8a deleted (was d3fe665d270)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch dependabot/npm_and_yarn/ui/multi-0bda765b8a in repository https://gitbox.apache.org/repos/asf/cloudstack.git was d3fe665d270 Bump ejs, @vue/cli and @vue/cli-service in /ui The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack) branch main updated (d5241d319c3 -> 433956c6ae1)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git from d5241d319c3 Merge release branch 4.19 to main add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail view (#8781) add d1ca79b65b3 ui: show systemvm agent version in the list and resource view (#9011) add 5c9d79e3fb4 Upgrade org.json:json version (#8750) add aad410ae6c0 Merge remote-tracking branch 'origin/4.18' into 4.19 add 433956c6ae1 Merge remote-tracking branch 'origin/4.19' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- ui/src/config/section/infra/systemVms.js | 4 ++-- ui/src/views/AutogenView.vue | 6 ++ 3 files changed, 9 insertions(+), 3 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit aad410ae6c0593fb810e59c37c18d25f1bcb633d Merge: d1ca79b65b3 5c9d79e3fb4 Author: Rohit Yadav AuthorDate: Wed May 1 12:05:52 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cloudstack) branch 4.19 updated (d1ca79b65b3 -> aad410ae6c0)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from d1ca79b65b3 ui: show systemvm agent version in the list and resource view (#9011) add 5c9d79e3fb4 Upgrade org.json:json version (#8750) new aad410ae6c0 Merge remote-tracking branch 'origin/4.18' into 4.19 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(cloudstack) branch 4.19 updated: ui: show systemvm agent version in the list and resource view (#9011)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new d1ca79b65b3 ui: show systemvm agent version in the list and resource
view (#9011)
d1ca79b65b3 is described below
commit d1ca79b65b3a3a3ac2e3ca166acca62ae2cb1f18
Author: Rohit Yadav
AuthorDate: Tue Apr 30 19:13:16 2024 +0530
ui: show systemvm agent version in the list and resource view (#9011)
This adds changes to show the systemvm agent version in the list and
resource view.
Fixes #6831
Signed-off-by: Rohit Yadav
---
ui/src/config/section/infra/systemVms.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/src/config/section/infra/systemVms.js
b/ui/src/config/section/infra/systemVms.js
index e48b19cb5d4..68a27f73a52 100644
--- a/ui/src/config/section/infra/systemVms.js
+++ b/ui/src/config/section/infra/systemVms.js
@@ -24,8 +24,8 @@ export default {
icon: 'thunderbolt-outlined',
docHelp: 'adminguide/systemvm.html',
permission: ['listSystemVms'],
- columns: ['name', 'state', 'agentstate', 'systemvmtype', 'publicip',
'privateip', 'linklocalip', 'hostname', 'zonename'],
- details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip',
'privateip', 'linklocalip', 'gateway', 'hostname', 'zonename', 'created',
'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate'],
+ columns: ['name', 'state', 'agentstate', 'systemvmtype', 'publicip',
'privateip', 'linklocalip', 'version', 'hostname', 'zonename'],
+ details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip',
'privateip', 'linklocalip', 'gateway', 'hostname', 'version', 'zonename',
'created', 'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate'],
resourceType: 'SystemVm',
filters: () => {
const filters = ['starting', 'running', 'stopping', 'stopped',
'destroyed', 'expunging', 'migrating', 'error', 'unknown', 'shutdown']
(cloudstack) branch fix-add-remove-vmware-dc deleted (was 4a217c1ad46)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch fix-add-remove-vmware-dc in repository https://gitbox.apache.org/repos/asf/cloudstack.git was 4a217c1ad46 hide the button for non vmware envs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack) branch 4.19 updated (027149487b5 -> 981310c2fe7)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981) add 981310c2fe7 UI: Fix the Add / Remove Vmware DC button on Zone detail view (#8781) No new revisions were added by this update. Summary of changes: ui/src/views/AutogenView.vue | 6 ++ 1 file changed, 6 insertions(+)
(cloudstack) branch 4.18 updated: Upgrade org.json:json version (#8750)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.18 in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/4.18 by this push: new 5c9d79e3fb4 Upgrade org.json:json version (#8750) 5c9d79e3fb4 is described below commit 5c9d79e3fb474c583522bda978a620ffee782975 Author: Vishesh AuthorDate: Tue Apr 30 18:23:51 2024 +0530 Upgrade org.json:json version (#8750) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d561be..cff8af3e422 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ 2.12.5 2.2.1 0.1.55 -20090211 +20231013 1.2 2.7.0 0.5.3
(cloudstack) branch 4.19 updated: Fix: Update rootdisksize detail on restore VM (#8981)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 027149487b5 Fix: Update rootdisksize detail on restore VM (#8981)
027149487b5 is described below
commit 027149487b509be5cccef1b8ea73de7707bc35d7
Author: Vishesh
AuthorDate: Mon Apr 29 22:15:06 2024 +0530
Fix: Update rootdisksize detail on restore VM (#8981)
* Fix: Update rootdisksize detail on restore VM
* minor fixup
---
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 26 +-
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index e574d9887c3..4283b44e171 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -7975,17 +7975,25 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
private void updateVolume(Volume vol, VMTemplateVO template, UserVmVO
userVm, DiskOffering diskOffering, Map details) {
VolumeVO resizedVolume = (VolumeVO) vol;
-if (userVmDetailsDao.findDetail(userVm.getId(),
VmDetailConstants.ROOT_DISK_SIZE) == null &&
!vol.getSize().equals(template.getSize())) {
-if (template.getSize() != null) {
+if (template != null && template.getSize() != null) {
+UserVmDetailVO vmRootDiskSizeDetail =
userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
+if (vmRootDiskSizeDetail == null) {
resizedVolume.setSize(template.getSize());
+} else {
+long rootDiskSize =
Long.parseLong(vmRootDiskSizeDetail.getValue()) * GiB_TO_BYTES;
+if (template.getSize() >= rootDiskSize) {
+resizedVolume.setSize(template.getSize());
+userVmDetailsDao.remove(vmRootDiskSizeDetail.getId());
+} else {
+resizedVolume.setSize(rootDiskSize);
+}
}
}
if (diskOffering != null) {
resizedVolume.setDiskOfferingId(diskOffering.getId());
-resizedVolume.setSize(diskOffering.getDiskSize());
-if (diskOffering.isCustomized()) {
-resizedVolume.setSize(vol.getSize());
+if (!diskOffering.isCustomized()) {
+resizedVolume.setSize(diskOffering.getDiskSize());
}
if (diskOffering.getMinIops() != null) {
resizedVolume.setMinIops(diskOffering.getMinIops());
@@ -7999,6 +8007,14 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
if
(StringUtils.isNumeric(details.get(VmDetailConstants.ROOT_DISK_SIZE))) {
Long rootDiskSize =
Long.parseLong(details.get(VmDetailConstants.ROOT_DISK_SIZE)) * GiB_TO_BYTES;
resizedVolume.setSize(rootDiskSize);
+UserVmDetailVO vmRootDiskSizeDetail =
userVmDetailsDao.findDetail(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE);
+if (vmRootDiskSizeDetail != null) {
+
vmRootDiskSizeDetail.setValue(details.get(VmDetailConstants.ROOT_DISK_SIZE));
+userVmDetailsDao.update(vmRootDiskSizeDetail.getId(),
vmRootDiskSizeDetail);
+} else {
+userVmDetailsDao.persist(new
UserVmDetailVO(userVm.getId(), VmDetailConstants.ROOT_DISK_SIZE,
+details.get(VmDetailConstants.ROOT_DISK_SIZE),
true));
+}
}
String minIops = details.get(MIN_IOPS);
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3de1f8b4baf2af1b1cd5387aff4024a1fdd5a8ec
Merge: b23ceefc7ea 9d5d4e55648
Author: Rohit Yadav
AuthorDate: Mon Apr 29 13:44:34 2024 +0530
Merge remote-tracking branch 'origin/4.18' into 4.19
Signed-off-by: Rohit Yadav
.../upgrade/SystemVmTemplateRegistration.java | 11 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +
.../hypervisor/kvm/resource/MigrateKVMAsync.java | 45 +++-
.../wrapper/LibvirtMigrateCommandWrapper.java | 29 +-
.../kvm/resource/MigrateKVMAsyncTest.java | 83 +++
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 78 --
.../kvm/storage/LinstorStorageAdaptor.java | 114 +
.../configuration/ConfigurationManagerImpl.java| 2 +-
8 files changed, 311 insertions(+), 55 deletions(-)
diff --cc
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
index 67e00aa7063,7071758fcbe..29a5e1f934b
---
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
+++
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapperTest.java
@@@ -29,6 -30,8 +30,7 @@@ import java.util.Arrays
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Scanner;
+ import java.util.Set;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@@ -750,13 -771,11 +760,11 @@@ public class LibvirtMigrateCommandWrapp
@Test
public void testReplaceStorage() throws Exception {
- Map mapMigrateStorage = new HashMap();
+ Map mapMigrateStorage =
createMapMigrateStorage("sourceTest",
"/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6");
- MigrateDiskInfo diskInfo = new MigrateDiskInfo("123456",
DiskType.BLOCK, DriverType.RAW, Source.FILE, "sourctest");
-
mapMigrateStorage.put("/mnt/812ea6a3-7ad0-30f4-9cab-01e3f2985b98/4650a2f7-fce5-48e2-beaa-bcdf063194e6",
diskInfo);
final String result =
libvirtMigrateCmdWrapper.replaceStorage(fullfile, mapMigrateStorage, true);
-InputStream in = IOUtils.toInputStream(result);
+InputStream in = IOUtils.toInputStream(result, "UTF-8");
DocumentBuilderFactory docFactory =
DocumentBuilderFactory.newInstance();
DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
Document doc = docBuilder.parse(in);
diff --cc
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index d560c4ee806,b38ab382a42..3a327b158d2
---
a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++
b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -33,7 -35,10 +33,8 @@@ import org.apache.cloudstack.utils.qemu
import org.apache.log4j.Logger;
import org.libvirt.LibvirtException;
-import com.cloud.storage.Storage;
-import com.cloud.utils.exception.CloudRuntimeException;
import com.linbit.linstor.api.ApiClient;
+ import com.linbit.linstor.api.ApiConsts;
import com.linbit.linstor.api.ApiException;
import com.linbit.linstor.api.Configuration;
import com.linbit.linstor.api.DevelopersApi;
(cloudstack) branch 4.19 updated (b23ceefc7ea -> 3de1f8b4baf)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from b23ceefc7ea utils: cleanup MacAddress and MacAddressTest (#8988) add 0e08a126dfd systemvm: add template_zone_ref record when add a new zone with same hypervisor type (#8395) add cec6ade257c change live migration API used on kvm (#8952) add eead2710f81 explanatory error message on delete attempt of default system offering (#8883) add 9d5d4e55648 linstor: cleanup diskless nodes on disconnect (#8790) new 3de1f8b4baf Merge remote-tracking branch 'origin/4.18' into 4.19 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../upgrade/SystemVmTemplateRegistration.java | 11 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 + .../hypervisor/kvm/resource/MigrateKVMAsync.java | 45 +++- .../wrapper/LibvirtMigrateCommandWrapper.java | 29 +- .../kvm/resource/MigrateKVMAsyncTest.java | 83 +++ .../wrapper/LibvirtMigrateCommandWrapperTest.java | 78 -- .../kvm/storage/LinstorStorageAdaptor.java | 114 + .../configuration/ConfigurationManagerImpl.java| 2 +- 8 files changed, 311 insertions(+), 55 deletions(-) create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/MigrateKVMAsyncTest.java
(cloudstack) branch 4.19 updated: utils: cleanup MacAddress and MacAddressTest (#8988)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new b23ceefc7ea utils: cleanup MacAddress and MacAddressTest (#8988)
b23ceefc7ea is described below
commit b23ceefc7eabbc0bab85c85ffd7d4fdcbdc4c7b8
Author: Rohit Yadav
AuthorDate: Mon Apr 29 13:42:31 2024 +0530
utils: cleanup MacAddress and MacAddressTest (#8988)
* utils: cleanup MacAddress and MacAddressTest
Cleanup old mac address handling code to use JDK11 lib instead of hacks.
Also really strange to see some basic string parsing code was written by
hand, replaced with Long.parseValue(str, 16) to convert hex string to
long.
Signed-off-by: Rohit Yadav
* address review comments
Signed-off-by: Rohit Yadav
-
Signed-off-by: Rohit Yadav
---
.../main/java/com/cloud/utils/net/MacAddress.java | 233 +++--
.../java/com/cloud/utils/net/MacAddressTest.java | 14 +-
2 files changed, 40 insertions(+), 207 deletions(-)
diff --git a/utils/src/main/java/com/cloud/utils/net/MacAddress.java
b/utils/src/main/java/com/cloud/utils/net/MacAddress.java
index d7ac9e39e7f..76f3f6c24ac 100644
--- a/utils/src/main/java/com/cloud/utils/net/MacAddress.java
+++ b/utils/src/main/java/com/cloud/utils/net/MacAddress.java
@@ -19,25 +19,19 @@
package com.cloud.utils.net;
-import static com.cloud.utils.AutoCloseableUtil.closeAutoCloseable;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
import java.net.UnknownHostException;
+import java.util.Collections;
import java.util.Formatter;
-
-import org.apache.log4j.Logger;
+import java.util.List;
/**
* This class retrieves the (first) MAC address for the machine is it is
loaded on and stores it statically for retrieval.
* It can also be used for formatting MAC addresses.
- * copied fnd addpeted rom the public domain utility from John Burkard.
**/
public class MacAddress {
-private static final Logger s_logger = Logger.getLogger(MacAddress.class);
private long _addr = 0;
protected MacAddress() {
@@ -75,213 +69,52 @@ public class MacAddress {
return toString(":");
}
-private static MacAddress s_address;
-static {
-String macAddress = null;
-
-Process p = null;
-BufferedReader in = null;
+private static MacAddress macAddress;
+static {
+String macString = null;
try {
-String osname = System.getProperty("os.name");
-
-if (osname.startsWith("Windows")) {
-p = Runtime.getRuntime().exec(new String[] {"ipconfig",
"/all"}, null);
-} else if (osname.startsWith("Solaris") ||
osname.startsWith("SunOS")) {
-// Solaris code must appear before the generic code
-String hostName = MacAddress.getFirstLineOfCommand(new
String[] {"uname", "-n"});
-if (hostName != null) {
-p = Runtime.getRuntime().exec(new String[]
{"/usr/sbin/arp", hostName}, null);
-}
-} else if (new File("/usr/sbin/lanscan").exists()) {
-p = Runtime.getRuntime().exec(new String[]
{"/usr/sbin/lanscan"}, null);
-} else if (new File("/sbin/ifconfig").exists()) {
-p = Runtime.getRuntime().exec(new String[] {"/sbin/ifconfig",
"-a"}, null);
-}
-
-if (p != null) {
-in = new BufferedReader(new
InputStreamReader(p.getInputStream()), 128);
-String l = null;
-while ((l = in.readLine()) != null) {
-macAddress = MacAddress.parse(l);
-if (macAddress != null) {
-short parsedShortMacAddress =
MacAddress.parseShort(macAddress);
-if (parsedShortMacAddress != 0xff &&
parsedShortMacAddress != 0x00)
-break;
+final List nics =
Collections.list(NetworkInterface.getNetworkInterfaces());
+Collections.reverse(nics);
+for (final NetworkInterface nic : nics) {
+final byte[] mac = nic.getHardwareAddress();
+if (mac != null &&
+!nic.isVirtual() &&
+!nic.isLoopback() &&
+!nic.getName().startsWith("br") &&
+!nic.getName().startsWith("veth") &&
+!nic.getNa
(cloudstack) branch 4.19 updated (e409c6d870a -> 80a8b80a9d5)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from e409c6d870a Fixup listing of serivce offering & storagepools with tags (#8937) add 80a8b80a9d5 Update volume's passphrase to null if diskOffering doesn't support encryption (#8904) No new revisions were added by this update. Summary of changes: .../orchestration/service/VolumeOrchestrationService.java | 2 +- .../cloudstack/engine/orchestration/VolumeOrchestrator.java | 11 +-- .../apache/cloudstack/storage/volume/VolumeServiceImpl.java | 2 +- server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 6 +++--- 4 files changed, 10 insertions(+), 11 deletions(-)
(cloudstack) branch 4.19 updated (80a8b80a9d5 -> 08132acaa2f)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 80a8b80a9d5 Update volume's passphrase to null if diskOffering doesn't support encryption (#8904) add 08132acaa2f Fix restore VM with allocated root disk (#8977) No new revisions were added by this update. Summary of changes: .github/workflows/ci.yml | 1 + .../main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +- test/integration/smoke/test_restore_vm.py | 108 + ui/src/views/compute/ReinstallVm.vue | 18 +++- 4 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 test/integration/smoke/test_restore_vm.py
(cloudstack) branch main updated: plugin: fix nsx build failure with mvn 3.9 (#8974)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/main by this push: new 380385d0451 plugin: fix nsx build failure with mvn 3.9 (#8974) 380385d0451 is described below commit 380385d045164a91e00511c4a920da225201c8b9 Author: Rohit Yadav AuthorDate: Fri Apr 26 17:24:24 2024 +0530 plugin: fix nsx build failure with mvn 3.9 (#8974) This excludes indirect dependencies of vapi-authentication to allow build to work. Signed-off-by: Rohit Yadav --- plugins/network-elements/nsx/pom.xml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/plugins/network-elements/nsx/pom.xml b/plugins/network-elements/nsx/pom.xml index bed5731feee..9e8d6ee7bce 100644 --- a/plugins/network-elements/nsx/pom.xml +++ b/plugins/network-elements/nsx/pom.xml @@ -49,6 +49,12 @@ com.vmware.vapi vapi-authentication 2.40.0 + + +* +* + + com.vmware.vapi
(cloudstack) branch main updated: Clean up `.asf.yaml` collaborators (#8982)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git The following commit(s) were added to refs/heads/main by this push: new b93a86c9da8 Clean up `.asf.yaml` collaborators (#8982) b93a86c9da8 is described below commit b93a86c9da8ce759d2821f2fac3ef06021b7ebfd Author: John Bampton AuthorDate: Fri Apr 26 15:41:25 2024 +1000 Clean up `.asf.yaml` collaborators (#8982) Remove `kiranchavala` now a committer https://github.com/kiranchavala --- .asf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 67b68a34223..507a0ca6dd5 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -51,7 +51,6 @@ github: collaborators: - acs-robot -- kiranchavala - rajujith - GaOrtiga - SadiJr
(cloudstack-terraform-provider) branch main updated: [StepSecurity] ci: Harden GitHub Actions (#103)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git
The following commit(s) were added to refs/heads/main by this push:
new e4c9861 [StepSecurity] ci: Harden GitHub Actions (#103)
e4c9861 is described below
commit e4c986131f08ada761ea92c9f9e85c6dab5faa74
Author: StepSecurity Bot
AuthorDate: Thu Apr 25 21:26:41 2024 -0700
[StepSecurity] ci: Harden GitHub Actions (#103)
Signed-off-by: StepSecurity Bot
---
.github/workflows/build.yml | 3 +++
.github/workflows/testacc.yml | 3 +++
2 files changed, 6 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f2acf05..0d13ff5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,6 +23,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}
cancel-in-progress: true
+permissions:
+ contents: read
+
jobs:
build:
runs-on: ubuntu-22.04
diff --git a/.github/workflows/testacc.yml b/.github/workflows/testacc.yml
index e2adc43..2534485 100644
--- a/.github/workflows/testacc.yml
+++ b/.github/workflows/testacc.yml
@@ -23,6 +23,9 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.ref }}-testacc
cancel-in-progress: true
+permissions:
+ contents: read
+
jobs:
testacc:
name: Acceptance Test
(cloudstack-terraform-provider) branch dependabot/go_modules/github.com/apache/cloudstack-go/v2-2.16.0 deleted (was cea1d18)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch dependabot/go_modules/github.com/apache/cloudstack-go/v2-2.16.0 in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git was cea1d18 Bump github.com/apache/cloudstack-go/v2 from 2.13.2 to 2.16.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack) branch main updated (27124c10319 -> 836ef9ec709)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 27124c10319 Add ability to set cpu.threadspercore similar to existing cpu.corespersocket (#8850) add 3b0e6ac90c0 VR: fix dnmasq misconfiguration if there are multiple IP ranges in a shared network (#8741) add 77df9ad4d78 codecov: fix Github action workflow add 5745674da5f Merge remote-tracking branch 'origin/4.18' into 4.19 add 4c27574570d .github: fix codecov action configuration new 836ef9ec709 Merge remote-tracking branch 'origin/4.19' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci.yml | 2 +- .github/workflows/codecov.yml| 2 +- .github/workflows/ui.yml | 2 +- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 12 +--- ui/src/views/compute/wizard/NetworkConfiguration.vue | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.19'
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 836ef9ec709a30f85d2269f31fb475cf94254852 Merge: 27124c10319 4c27574570d Author: Rohit Yadav AuthorDate: Thu Apr 25 09:55:09 2024 +0530 Merge remote-tracking branch 'origin/4.19' Signed-off-by: Rohit Yadav Conflicts: systemvm/debian/opt/cloud/bin/cs/CsHelper.py .github/workflows/ci.yml | 2 +- .github/workflows/codecov.yml| 2 +- .github/workflows/ui.yml | 2 +- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 12 +--- ui/src/views/compute/wizard/NetworkConfiguration.vue | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-)
(cloudstack) 02/02: .github: fix codecov action configuration
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 4c27574570d183e5f9203be0164fed9d4295302e Author: Rohit Yadav AuthorDate: Thu Apr 25 09:46:37 2024 +0530 .github: fix codecov action configuration `token` is documented to work with codecov-action@v4 Signed-off-by: Rohit Yadav --- .github/workflows/ci.yml | 2 +- .github/workflows/ui.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87edfe890b0..6a6ea33b14a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -312,7 +312,7 @@ jobs: echo -e "Simulator CI Test Results: (only failures listed)\n" python3 ./tools/marvin/xunit-reader.py integration-test-results/ - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: files: jacoco-coverage.xml fail_ci_if_error: true diff --git a/.github/workflows/ui.yml b/.github/workflows/ui.yml index b3230eeaca3..476526aff32 100644 --- a/.github/workflows/ui.yml +++ b/.github/workflows/ui.yml @@ -55,7 +55,7 @@ jobs: npm run lint npm run test:unit - - uses: codecov/codecov-action@v3 + - uses: codecov/codecov-action@v4 with: working-directory: ui files: ./coverage/lcov.info
(cloudstack) 01/02: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 5745674da5ffbaa65a5a275e0cd5b63b8472663a Merge: 0514caedd6a 77df9ad4d78 Author: Rohit Yadav AuthorDate: Thu Apr 25 09:45:08 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .github/workflows/codecov.yml| 2 +- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 14 ++ ui/src/views/compute/wizard/NetworkConfiguration.vue | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-)
(cloudstack) branch 4.19 updated (0514caedd6a -> 4c27574570d)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 0514caedd6a Merge release branch 4.18 to 4.19 add 3b0e6ac90c0 VR: fix dnmasq misconfiguration if there are multiple IP ranges in a shared network (#8741) add 77df9ad4d78 codecov: fix Github action workflow new 5745674da5f Merge remote-tracking branch 'origin/4.18' into 4.19 new 4c27574570d .github: fix codecov action configuration The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci.yml | 2 +- .github/workflows/codecov.yml| 2 +- .github/workflows/ui.yml | 2 +- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 14 ++ ui/src/views/compute/wizard/NetworkConfiguration.vue | 2 +- 6 files changed, 11 insertions(+), 13 deletions(-)
(cloudstack) branch 4.18 updated: codecov: fix Github action workflow
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.18 by this push:
new 77df9ad4d78 codecov: fix Github action workflow
77df9ad4d78 is described below
commit 77df9ad4d788d0f452ed2c82970de9a534278a27
Author: Rohit Yadav
AuthorDate: Thu Apr 25 09:43:50 2024 +0530
codecov: fix Github action workflow
Signed-off-by: Rohit Yadav
---
.github/workflows/codecov.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index fcbcf9b8bfc..2a45e87d41e 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -47,9 +47,11 @@ jobs:
cd nonoss && bash -x install-non-oss.sh && cd ..
mvn -P quality -Dsimulator -Dnoredist clean install -T$(nproc)
- - uses: codecov/codecov-action@v3
+ - uses: codecov/codecov-action@v4
with:
files: ./client/target/site/jacoco-aggregate/jacoco.xml
fail_ci_if_error: true
+ flags: unittests
verbose: true
name: codecov
+ token: ${{ secrets.CODECOV_TOKEN }}
(cloudstack) branch main updated: Add ability to set cpu.threadspercore similar to existing cpu.corespersocket (#8850)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 27124c10319 Add ability to set cpu.threadspercore similar to existing
cpu.corespersocket (#8850)
27124c10319 is described below
commit 27124c10319db90ab929222e52f7eedfe7f8b4e9
Author: Marcus Sorensen
AuthorDate: Wed Apr 24 06:31:21 2024 -0600
Add ability to set cpu.threadspercore similar to existing
cpu.corespersocket (#8850)
* Add ability to set cpu.threadspercore similar to existing
cpu.corespersocket
* add cpu.threadspercore to VM and template detail options
* Update
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
Co-authored-by: Suresh Kumar Anaparti
* add vm detail for KVM
-
Co-authored-by: Marcus Sorensen
Co-authored-by: Suresh Kumar Anaparti
---
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 +
.../kvm/resource/LibvirtComputingResource.java | 41 +++---
.../kvm/resource/LibvirtDomainXMLParser.java | 5 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 12 ++-
.../kvm/resource/LibvirtCpuTopologyTest.java | 94 ++
.../kvm/resource/LibvirtDomainXMLParserTest.java | 7 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 13 +++
.../java/com/cloud/api/query/QueryManagerImpl.java | 1 +
8 files changed, 155 insertions(+), 19 deletions(-)
diff --git a/api/src/main/java/com/cloud/vm/VmDetailConstants.java
b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
index 9338cc11cd4..603948d76cf 100644
--- a/api/src/main/java/com/cloud/vm/VmDetailConstants.java
+++ b/api/src/main/java/com/cloud/vm/VmDetailConstants.java
@@ -19,6 +19,7 @@ package com.cloud.vm;
public interface VmDetailConstants {
String KEYBOARD = "keyboard";
String CPU_CORE_PER_SOCKET = "cpu.corespersocket";
+String CPU_THREAD_PER_CORE = "cpu.threadspercore";
String ROOT_DISK_SIZE = "rootdisksize";
String BOOT_MODE = "boot.mode";
String NAME_ON_HYPERVISOR= "nameonhypervisor";
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 11cf6328666..5eed56806b8 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -5149,31 +5149,48 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
return false;
}
-private void setCpuTopology(CpuModeDef cmd, int vCpusInDef, Map details) {
+protected void setCpuTopology(CpuModeDef cmd, int vCpusInDef, Map details) {
if (!enableManuallySettingCpuTopologyOnKvmVm) {
LOGGER.debug(String.format("Skipping manually setting CPU topology
on VM's XML due to it is disabled in agent.properties {\"property\": \"%s\",
\"value\": %s}.",
AgentProperties.ENABLE_MANUALLY_SETTING_CPU_TOPOLOGY_ON_KVM_VM.getName(),
enableManuallySettingCpuTopologyOnKvmVm));
return;
}
-// multi cores per socket, for larger core configs
-int numCoresPerSocket = -1;
+
+int numCoresPerSocket = 1;
+int numThreadsPerCore = 1;
+
if (details != null) {
-final String coresPerSocket =
details.get(VmDetailConstants.CPU_CORE_PER_SOCKET);
-final int intCoresPerSocket = NumbersUtil.parseInt(coresPerSocket,
numCoresPerSocket);
-if (intCoresPerSocket > 0 && vCpusInDef % intCoresPerSocket == 0) {
-numCoresPerSocket = intCoresPerSocket;
-}
+numCoresPerSocket =
NumbersUtil.parseInt(details.get(VmDetailConstants.CPU_CORE_PER_SOCKET), 1);
+numThreadsPerCore =
NumbersUtil.parseInt(details.get(VmDetailConstants.CPU_THREAD_PER_CORE), 1);
}
-if (numCoresPerSocket <= 0) {
+
+if ((numCoresPerSocket * numThreadsPerCore) > vCpusInDef) {
+LOGGER.warn(String.format("cores per socket (%d) * threads per
core (%d) exceeds total VM cores. Ignoring extra topology", numCoresPerSocket,
numThreadsPerCore));
+numCoresPerSocket = 1;
+numThreadsPerCore = 1;
+}
+
+if (vCpusInDef % (numCoresPerSocket * numThreadsPerCore) != 0) {
+LOGGER.warn(String.format("cores per socket(%d) * threads per
core(%d) doesn't divide evenly into total VM cores(%d). Ignoring extra
topology", numCoresPerSocket, numThreadsPer
(cloudstack) branch main updated (bf9fdaddbd2 -> 93d4816ee8e)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git from bf9fdaddbd2 Fix build errors due to log4j 2.x changes add 582249c1f72 Fix permission to manipulate VMs and templates settings through UI (#8778) add 5a52ca78ae5 kvm: export sysinfo for arm64 domains for cloud-init to work (#8940) add 405aac38bc9 linstor: Only set allow-two-primaries if resource is already in use (#8802) add 0577b0ac8ef server: add logs to public ip allocation attempt (#8239) add 0fa71f56966 Merge remote-tracking branch 'origin/4.18' into 4.19 new 93d4816ee8e Merge remote-tracking branch 'origin/4.19' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-- .../kvm/storage/LinstorStorageAdaptor.java | 33 +-- .../storage/datastore/util/LinstorUtil.java| 19 +++ .../com/cloud/network/IpAddressManagerImpl.java| 38 +- ui/src/components/view/DetailSettings.vue | 14 +--- 5 files changed, 81 insertions(+), 27 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.19'
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 93d4816ee8e1d5dd5b4ab4b416bb8337e63841c0
Merge: bf9fdaddbd2 0fa71f56966
Author: Rohit Yadav
AuthorDate: Tue Apr 23 15:24:19 2024 +0530
Merge remote-tracking branch 'origin/4.19'
Signed-off-by: Rohit Yadav
Conflicts:
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
.../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +--
.../kvm/storage/LinstorStorageAdaptor.java | 33 +--
.../storage/datastore/util/LinstorUtil.java| 19 +++
.../com/cloud/network/IpAddressManagerImpl.java| 38 +-
ui/src/components/view/DetailSettings.vue | 14 +---
5 files changed, 81 insertions(+), 27 deletions(-)
diff --cc
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
index 794abfd2a38,d560c4ee806..864a07801ae
---
a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
+++
b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
@@@ -266,18 -283,9 +288,9 @@@ public class LinstorStorageAdaptor impl
try
{
- // allow 2 primaries for live migration, should be removed by
disconnect on the other end
- ResourceDefinitionModify rdm = new ResourceDefinitionModify();
- Properties props = new Properties();
- props.put("DrbdOptions/Net/allow-two-primaries", "yes");
- rdm.setOverrideProps(props);
- ApiCallRcList answers = api.resourceDefinitionModify(rscName,
rdm);
- if (answers.hasError()) {
- logger.error("Unable to set 'allow-two-primaries' on " +
rscName);
- // do not fail here as adding allow-two-primaries property is
only a problem while live migrating
- }
+ allow2PrimariesIfInUse(api, rscName);
} catch (ApiException apiEx) {
-s_logger.error(apiEx);
+logger.error(apiEx);
// do not fail here as adding allow-two-primaries property is
only a problem while live migrating
}
return true;
(cloudstack) branch 4.19 updated (582249c1f72 -> 0fa71f56966)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 582249c1f72 Fix permission to manipulate VMs and templates settings through UI (#8778) add 5a52ca78ae5 kvm: export sysinfo for arm64 domains for cloud-init to work (#8940) add 405aac38bc9 linstor: Only set allow-two-primaries if resource is already in use (#8802) add 0577b0ac8ef server: add logs to public ip allocation attempt (#8239) new 0fa71f56966 Merge remote-tracking branch 'origin/4.18' into 4.19 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-- .../kvm/storage/LinstorStorageAdaptor.java | 33 +-- .../storage/datastore/util/LinstorUtil.java| 19 +++ .../com/cloud/network/IpAddressManagerImpl.java| 38 +- 4 files changed, 72 insertions(+), 22 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit 0fa71f56966c834e10060cdbba1c124fd3b075f0 Merge: 582249c1f72 0577b0ac8ef Author: Rohit Yadav AuthorDate: Tue Apr 23 15:21:44 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../hypervisor/kvm/resource/LibvirtVMDef.java | 4 +-- .../kvm/storage/LinstorStorageAdaptor.java | 33 +-- .../storage/datastore/util/LinstorUtil.java| 19 +++ .../com/cloud/network/IpAddressManagerImpl.java| 38 +- 4 files changed, 72 insertions(+), 22 deletions(-) diff --cc plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java index 33cbea0996d,c8544fd3e3e..8c42bdc2a96 --- a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java +++ b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java @@@ -22,14 -22,10 +22,15 @@@ import com.linbit.linstor.api.Configura import com.linbit.linstor.api.DevelopersApi; import com.linbit.linstor.api.model.ApiCallRc; import com.linbit.linstor.api.model.ApiCallRcList; +import com.linbit.linstor.api.model.Node; import com.linbit.linstor.api.model.ProviderKind; + import com.linbit.linstor.api.model.Resource; import com.linbit.linstor.api.model.ResourceGroup; +import com.linbit.linstor.api.model.ResourceWithVolumes; import com.linbit.linstor.api.model.StoragePool; +import com.linbit.linstor.api.model.Volume; + +import javax.annotation.Nonnull; import java.util.Collections; import java.util.List;
(cloudstack-terraform-provider) branch DaanHoogland-patch-1-1 deleted (was 669b71a)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch DaanHoogland-patch-1-1 in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git was 669b71a Update hash generation The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack-terraform-provider) branch main updated: Update hash generation (#108)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git The following commit(s) were added to refs/heads/main by this push: new 368cb0a Update hash generation (#108) 368cb0a is described below commit 368cb0a3044bc616601058d42d037b661b6551c0 Author: dahn AuthorDate: Sat Apr 20 07:14:33 2024 +0200 Update hash generation (#108) md5 deprecated sha512 use specific tool for easy validation --- performrelease.sh | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/performrelease.sh b/performrelease.sh index f21a679..e733da9 100755 --- a/performrelease.sh +++ b/performrelease.sh @@ -102,11 +102,8 @@ else gpg -v --default-key $certid --armor --output apache-cloudstack-terraform-provider-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-terraform-provider-$version-src.tar.bz2 fi -echo 'md5' -gpg -v --print-md MD5 apache-cloudstack-terraform-provider-$version-src.tar.bz2 > apache-cloudstack-terraform-provider-$version-src.tar.bz2.md5 - echo 'sha512' -gpg -v --print-md SHA512 apache-cloudstack-terraform-provider-$version-src.tar.bz2 > apache-cloudstack-terraform-provider-$version-src.tar.bz2.sha512 +sha512sum apache-cloudstack-terraform-provider-$version-src.tar.bz2 > apache-cloudstack-terraform-provider-$version-src.tar.bz2.sha512 echo 'verify' gpg -v --verify apache-cloudstack-terraform-provider-$version-src.tar.bz2.asc apache-cloudstack-terraform-provider-$version-src.tar.bz2
(cloudstack-www) branch main updated (1d0309da -> c2b2032b)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from 1d0309da src: prep/update website wrt 4.18.2.0 add cf44bca7 update for 4.18.2.0 release (#204) add c2b2032b Update users.mdx (#198) No new revisions were added by this update. Summary of changes: src/pages/users.mdx | 2 ++ 1 file changed, 2 insertions(+)
(cloudstack-www) branch staging-site updated (cf44bca7 -> c2b2032b)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from cf44bca7 update for 4.18.2.0 release (#204) add c2b2032b Update users.mdx (#198) No new revisions were added by this update. Summary of changes: src/pages/users.mdx | 2 ++ 1 file changed, 2 insertions(+)
(cloudstack-www) branch staging-site updated: update for 4.18.2.0 release (#204)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/staging-site by this push: new cf44bca7 update for 4.18.2.0 release (#204) cf44bca7 is described below commit cf44bca71ec070bb8d3b91609b9ba48791e60f86 Author: João Jandre <48719461+joaojan...@users.noreply.github.com> AuthorDate: Fri Apr 19 00:32:26 2024 -0300 update for 4.18.2.0 release (#204) Co-authored-by: João Jandre
(cloudstack-www) branch dependabot/npm_and_yarn/express-4.19.2 deleted (was d00a4c55)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch dependabot/npm_and_yarn/express-4.19.2 in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git was d00a4c55 Bump express from 4.18.2 to 4.19.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(cloudstack-www) branch main updated (c8efa441 -> 1d0309da)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from c8efa441 no embedded slides (#203) add 1d0309da src: prep/update website wrt 4.18.2.0 No new revisions were added by this update. Summary of changes: src/components/Releases/index.tsx | 1 + src/pages/downloads.mdx | 16 2 files changed, 9 insertions(+), 8 deletions(-)
(cloudstack-www) branch staging-site updated: src: prep/update website wrt 4.18.2.0
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/staging-site by this push: new 1d0309da src: prep/update website wrt 4.18.2.0 1d0309da is described below commit 1d0309dacf159a3bb092ebe49f0a072969b60de1 Author: Rohit Yadav AuthorDate: Fri Apr 19 08:46:27 2024 +0530 src: prep/update website wrt 4.18.2.0 Signed-off-by: Rohit Yadav --- src/components/Releases/index.tsx | 1 + src/pages/downloads.mdx | 16 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Releases/index.tsx b/src/components/Releases/index.tsx index b9e63a1c..74fe3bde 100644 --- a/src/components/Releases/index.tsx +++ b/src/components/Releases/index.tsx @@ -3,6 +3,7 @@ import React from "react"; const versions = [ '4.19.0.1', '4.19.0.0', + '4.18.2.0', '4.18.1.1', '4.18.1.0', '4.18.0.0', diff --git a/src/pages/downloads.mdx b/src/pages/downloads.mdx index 8f8b4690..4a1e285a 100644 --- a/src/pages/downloads.mdx +++ b/src/pages/downloads.mdx @@ -37,23 +37,23 @@ Instructions for building from source and upgrading from a previous version of CloudStack to Apache CloudStack 4.19.0.1 can be found in the upgrade section of the Release Notes (see above). -The latest CloudStack LTS maintenance release is `4.18.1.1` as part of the +The latest CloudStack LTS maintenance release is `4.18.2.0` as part of the previous LTS release. -http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.18.1.1/apache-cloudstack-4.18.1.1-src.tar.bz2;>Get the 4.18.1.1 Source +http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.18.2.0/apache-cloudstack-4.18.2.0-src.tar.bz2;>Get the 4.18.2.0 Source https://downloads.apache.org/cloudstack/KEYS;>KEYS -https://downloads.apache.org/cloudstack/releases/4.18.1.1/apache-cloudstack-4.18.1.1-src.tar.bz2.asc;>PGP -https://downloads.apache.org/cloudstack/releases/4.18.1.1/apache-cloudstack-4.18.1.1-src.tar.bz2.sha512;>SHA512 +https://downloads.apache.org/cloudstack/releases/4.18.2.0/apache-cloudstack-4.18.2.0-src.tar.bz2.asc;>PGP +https://downloads.apache.org/cloudstack/releases/4.18.2.0/apache-cloudstack-4.18.2.0-src.tar.bz2.sha512;>SHA512 -Full release notes can be found in the version [4.18.1.0 Release -Notes](https://docs.cloudstack.apache.org/en/4.18.1.0/releasenotes/) website. +Full release notes can be found in the version [4.18.2.0 Release +Notes](https://docs.cloudstack.apache.org/en/4.18.2.0/releasenotes/) website. Instructions for building from source and installing Apache CloudStack can be found in the [Installation -Guide](https://docs.cloudstack.apache.org/en/4.18.1.0/installguide/). +Guide](https://docs.cloudstack.apache.org/en/4.18.2.0/installguide/). Instructions for building from source and upgrading from a previous version of -CloudStack to Apache CloudStack 4.18.1.1 can be found in the upgrade section of +CloudStack to Apache CloudStack 4.18.2.0 can be found in the upgrade section of the Release Notes (see above). ### Community Packages
(cloudstack) branch main updated: Allow kvm storage plugin to customize diskdef, add geometry (#8839)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new dfd5158d678 Allow kvm storage plugin to customize diskdef, add
geometry (#8839)
dfd5158d678 is described below
commit dfd5158d678e127c08c204ccc4f947d9125f8ae0
Author: Suresh Kumar Anaparti
AuthorDate: Thu Apr 18 18:21:17 2024 +0530
Allow kvm storage plugin to customize diskdef, add geometry (#8839)
* Allow kvm storage plugin to customize diskdef, add geometry
* formatting update
-
Co-authored-by: Marcus Sorensen
---
.../kvm/resource/LibvirtComputingResource.java | 3 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 36 --
.../hypervisor/kvm/storage/KVMStoragePool.java | 3 ++
.../kvm/storage/KVMStorageProcessor.java | 1 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 14 +
5 files changed, 54 insertions(+), 3 deletions(-)
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index b30f2b6a6f0..11cf6328666 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3137,7 +3137,7 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
}
}
-
+pool.customizeLibvirtDiskDef(disk);
}
if (data instanceof VolumeObjectTO) {
@@ -3512,6 +3512,7 @@ public class LibvirtComputingResource extends
ServerResourceBase implements Serv
diskdef.setPhysicalBlockIOSize(attachingPool.getSupportedPhysicalBlockSize());
diskdef.setLogicalBlockIOSize(attachingPool.getSupportedLogicalBlockSize());
+attachingPool.customizeLibvirtDiskDef(diskdef);
}
final String xml = diskdef.toString();
diff --git
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 5e0c9044228..88f618351bb 100644
---
a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++
b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -596,6 +596,22 @@ public class LibvirtVMDef {
public QemuObject.EncryptFormat getEncryptFormat() { return
this.encryptFormat; }
}
+public static class DiskGeometry {
+int cylinders;
+int heads;
+int sectors;
+
+public DiskGeometry(int cylinders, int heads, int sectors) {
+this.cylinders = cylinders;
+this.heads = heads;
+this.sectors = sectors;
+}
+
+public String toXml() {
+return String.format("\n", this.cylinders, this.heads, this.sectors);
+}
+}
+
public enum DeviceType {
FLOPPY("floppy"), DISK("disk"), CDROM("cdrom"), LUN("lun");
String _type;
@@ -747,6 +763,7 @@ public class LibvirtVMDef {
private boolean isIothreadsEnabled;
private BlockIOSize logicalBlockIOSize = null;
private BlockIOSize physicalBlockIOSize = null;
+private DiskGeometry geometry = null;
public DiscardType getDiscard() {
return _discard;
@@ -1087,9 +1104,20 @@ public class LibvirtVMDef {
this._serial = serial;
}
-public void setLibvirtDiskEncryptDetails(LibvirtDiskEncryptDetails
details) { this.encryptDetails = details; }
+public void setLibvirtDiskEncryptDetails(LibvirtDiskEncryptDetails
details)
+{
+this.encryptDetails = details;
+}
+
+public LibvirtDiskEncryptDetails getLibvirtDiskEncryptDetails()
+{
+return this.encryptDetails;
+}
-public LibvirtDiskEncryptDetails getLibvirtDiskEncryptDetails() {
return this.encryptDetails; }
+public void setGeometry(DiskGeometry geometry)
+{
+this.geometry = geometry;
+}
public String getSourceHost() {
return _sourceHost;
@@ -1174,6 +1202,10 @@ public class LibvirtVMDef {
}
diskBuilder.append("/>\n");
+if (geometry != null) {
+diskBuilder.append(geometry.toXml());
+}
+
if (logicalBlockIOSize != null || physicalBlockIOSize != null) {
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit cadbb563afaa907a45e8931cb8a95e8ca5b8f034 Merge: 85110147071 8a101fbbc11 Author: Rohit Yadav AuthorDate: Thu Apr 18 10:21:54 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19
(cloudstack) branch 4.19 updated (85110147071 -> cadbb563afa)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 85110147071 Fix error message for checkVolume command (#8842) add 154566f914c Updating pom.xml version numbers for release 4.18.2.0 add 8a101fbbc11 Updating pom.xml version numbers for release 4.18.3.0-SNAPSHOT new cadbb563afa Merge remote-tracking branch 'origin/4.18' into 4.19 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(cloudstack) branch 4.19 updated: Fix error message for checkVolume command (#8842)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 85110147071 Fix error message for checkVolume command (#8842)
85110147071 is described below
commit 851101470718fa734d448fb57ce3b812c22bc626
Author: Vishesh
AuthorDate: Wed Apr 17 17:27:27 2024 +0530
Fix error message for checkVolume command (#8842)
---
server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 8679221107d..02add0db174 100644
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1895,7 +1895,8 @@ public class VolumeApiServiceImpl extends ManagerBase
implements VolumeApiServic
} else if (jobResult instanceof ResourceAllocationException) {
throw (ResourceAllocationException)jobResult;
} else if (jobResult instanceof Throwable) {
-throw new RuntimeException("Unexpected exception",
(Throwable)jobResult);
+Throwable throwable = (Throwable) jobResult;
+throw new RuntimeException(String.format("Unexpected
exception: %s", throwable.getMessage()), throwable);
}
}
(cloudstack) branch main updated: Introduce scheduled executor wrapper with dynamic interval (#8916)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 63a0797b180 Introduce scheduled executor wrapper with dynamic interval
(#8916)
63a0797b180 is described below
commit 63a0797b18046397961c620a39931552d90e0588
Author: Vishesh
AuthorDate: Wed Apr 17 15:15:37 2024 +0530
Introduce scheduled executor wrapper with dynamic interval (#8916)
* Introduce scheduled executor wrapper with dynamic interval
* Add validation for configkey
---
.../java/com/cloud/user/ResourceLimitService.java | 2 +-
.../config/ConfigKeyScheduledExecutionWrapper.java | 114 +
.../ConfigKeyScheduledExecutionWrapperTest.java| 177 +
.../resourcelimit/ResourceLimitManagerImpl.java| 10 +-
4 files changed, 297 insertions(+), 6 deletions(-)
diff --git a/api/src/main/java/com/cloud/user/ResourceLimitService.java
b/api/src/main/java/com/cloud/user/ResourceLimitService.java
index 0a64cbb7440..04560df428f 100644
--- a/api/src/main/java/com/cloud/user/ResourceLimitService.java
+++ b/api/src/main/java/com/cloud/user/ResourceLimitService.java
@@ -38,7 +38,7 @@ public interface ResourceLimitService {
static final ConfigKey MaxProjectSecondaryStorage = new
ConfigKey<>("Project Defaults", Long.class, "max.project.secondary.storage",
"400",
"The default maximum secondary storage space (in GiB) that can be
used for a project", false);
static final ConfigKey ResourceCountCheckInterval = new
ConfigKey<>("Advanced", Long.class, "resourcecount.check.interval", "300",
-"Time (in seconds) to wait before running resource recalculation
and fixing task. Default is 300 seconds, Setting this to 0 disables execution
of the task", false);
+"Time (in seconds) to wait before running resource recalculation
and fixing task. Default is 300 seconds, Setting this to 0 disables execution
of the task", true);
static final ConfigKey ResourceLimitHostTags = new
ConfigKey<>("Advanced", String.class, "resource.limit.host.tags", "",
"A comma-separated list of tags for host resource limits", true);
static final ConfigKey ResourceLimitStorageTags = new
ConfigKey<>("Advanced", String.class, "resource.limit.storage.tags", "",
diff --git
a/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java
b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java
new file mode 100644
index 000..b8d7e782971
--- /dev/null
+++
b/framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKeyScheduledExecutionWrapper.java
@@ -0,0 +1,114 @@
+// 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 org.apache.cloudstack.framework.config;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+/**
+ * Uses a ScheduledExecutorService and config key to execute a runnable,
+ * dynamically rescheduling based on the long value of the config key.
+ * Timing is similar to ScheduledExecutorService.scheduleAtFixedRate(),
+ * but we look up the next runtime dynamically via the config key.
+ *
+ * If config key is zero, this disables the execution. We skip execution
+ * and check once a minute in order to re-start execution if re-enabled.
+ */
+public class ConfigKeyScheduledExecutionWrapper implements Runnable {
+protected Logger logger = LogManager.getLogger(getClass());
+private final ScheduledExecutorService executorService;
+private final Runnable command;
+private final ConfigKey configKey;
+private final TimeUnit u
(cloudstack) branch main updated: Speedup resource count calculation (#8903)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new ebaf5a47b94 Speedup resource count calculation (#8903)
ebaf5a47b94 is described below
commit ebaf5a47b94689e7e3515d7282d3132506dd99ad
Author: Vishesh
AuthorDate: Wed Apr 17 14:21:30 2024 +0530
Speedup resource count calculation (#8903)
* Speed up resource count calculation
* Refactor resource count calculation
* Start transaction for updateCountByDeltaForIds
---
.../cloud/configuration/dao/ResourceCountDao.java | 7 ++
.../configuration/dao/ResourceCountDaoImpl.java| 71 +--
.../cloudstack/reservation/dao/ReservationDao.java | 1 +
.../reservation/dao/ReservationDaoImpl.java| 16 +++
.../resourcelimit/ResourceLimitManagerImpl.java| 137 +
5 files changed, 145 insertions(+), 87 deletions(-)
diff --git
a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
index 59e64dac880..b978cc04bfa 100644
---
a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
+++
b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDao.java
@@ -49,10 +49,15 @@ public interface ResourceCountDao extends
GenericDao {
ResourceCountVO findByOwnerAndTypeAndTag(long ownerId, ResourceOwnerType
ownerType, ResourceType type, String tag);
+List findByOwnersAndTypeAndTag(List ownerIdList,
ResourceOwnerType ownerType,
+ResourceType type, String tag);
+
List listResourceCountByOwnerType(ResourceOwnerType
ownerType);
Set listAllRowsToUpdate(long ownerId, ResourceOwnerType ownerType,
ResourceType type, String tag);
+boolean updateCountByDeltaForIds(List ids, boolean increment, long
delta);
+
Set listRowsToUpdateForDomain(long domainId, ResourceType type,
String tag);
long removeEntriesByOwner(long ownerId, ResourceOwnerType ownerType);
@@ -72,4 +77,6 @@ public interface ResourceCountDao extends
GenericDao {
long countMemoryAllocatedToAccount(long accountId);
void removeResourceCountsForNonMatchingTags(Long ownerId,
ResourceOwnerType ownerType, List types, List tags);
+
+List lockRows(Set ids);
}
diff --git
a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
index c90422377b8..65d7fed2d1a 100644
---
a/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
+++
b/engine/schema/src/main/java/com/cloud/configuration/dao/ResourceCountDaoImpl.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
@@ -56,27 +57,30 @@ public class ResourceCountDaoImpl extends
GenericDaoBase
private final SearchBuilder TypeSearch;
private final SearchBuilder TypeNullTagSearch;
private final SearchBuilder NonMatchingTagsSearch;
-
private final SearchBuilder AccountSearch;
private final SearchBuilder DomainSearch;
+private final SearchBuilder IdsSearch;
@Inject
private DomainDao _domainDao;
@Inject
private AccountDao _accountDao;
+protected static final String INCREMENT_COUNT_BY_IDS_SQL = "UPDATE
`cloud`.`resource_count` SET `count` = `count` + ? WHERE `id` IN (?)";
+protected static final String DECREMENT_COUNT_BY_IDS_SQL = "UPDATE
`cloud`.`resource_count` SET `count` = `count` - ? WHERE `id` IN (?)";
+
public ResourceCountDaoImpl() {
TypeSearch = createSearchBuilder();
TypeSearch.and("type", TypeSearch.entity().getType(),
SearchCriteria.Op.EQ);
-TypeSearch.and("accountId", TypeSearch.entity().getAccountId(),
SearchCriteria.Op.EQ);
-TypeSearch.and("domainId", TypeSearch.entity().getDomainId(),
SearchCriteria.Op.EQ);
+TypeSearch.and("accountId", TypeSearch.entity().getAccountId(),
SearchCriteria.Op.IN);
+TypeSearch.and("domainId", TypeSearch.entity().getDomainId(),
SearchCriteria.Op.IN);
TypeSearch.and("tag", TypeSearch.entity().getTag(),
SearchCriteria.Op.EQ);
TypeSearch.done();
TypeNullTagSearch = createSearchBuilder();
TypeNullTagSearch.and("type", TypeNullTagSearch.entity().getType(),
SearchCriteria.Op.EQ);
-TypeNullTagSearch.and("accountId",
TypeNullTagSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
-TypeNullTagSearch.and("domainId",
TypeNullTagSearch.entity().getDomainId(), SearchCriteria.Op.EQ)
(cloudstack) branch 4.19 updated (0a26f3315a1 -> a55ba96a08e)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git from 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885) add 6cd5c6a1d01 linstor: Do not pretend handling disconnect paths that are non Linstor (#8897) new a55ba96a08e Merge remote-tracking branch 'origin/4.18' into 4.19 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../kvm/storage/LinstorStorageAdaptor.java | 53 -- 1 file changed, 29 insertions(+), 24 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'origin/4.18' into 4.19
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch 4.19 in repository https://gitbox.apache.org/repos/asf/cloudstack.git commit a55ba96a08e3904641582eb1d03514098c8b8a90 Merge: 0a26f3315a1 6cd5c6a1d01 Author: Rohit Yadav AuthorDate: Tue Apr 16 16:10:33 2024 +0530 Merge remote-tracking branch 'origin/4.18' into 4.19 .../kvm/storage/LinstorStorageAdaptor.java | 53 -- 1 file changed, 29 insertions(+), 24 deletions(-) diff --cc plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java index 101e8d3597e,9ad8332d0e1..dd50c8d2214 --- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java +++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java @@@ -41,8 -45,10 +41,9 @@@ import com.linbit.linstor.api.model.Api import com.linbit.linstor.api.model.ApiCallRcList; import com.linbit.linstor.api.model.Properties; import com.linbit.linstor.api.model.ProviderKind; + import com.linbit.linstor.api.model.Resource; import com.linbit.linstor.api.model.ResourceDefinition; import com.linbit.linstor.api.model.ResourceDefinitionModify; -import com.linbit.linstor.api.model.ResourceGroup; import com.linbit.linstor.api.model.ResourceGroupSpawn; import com.linbit.linstor.api.model.ResourceMakeAvailable; import com.linbit.linstor.api.model.ResourceWithVolumes;
(cloudstack) branch 4.19 updated: Fix listStoragePoolsMetricsCmd (#8885)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 0a26f3315a1 Fix listStoragePoolsMetricsCmd (#8885)
0a26f3315a1 is described below
commit 0a26f3315a15288941205362b02fa0f6059e71dd
Author: Vishesh
AuthorDate: Tue Apr 16 15:52:09 2024 +0530
Fix listStoragePoolsMetricsCmd (#8885)
---
framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java | 4
1 file changed, 4 insertions(+)
diff --git a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
index 6724da8b8be..0eb45439769 100644
--- a/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
+++ b/framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java
@@ -57,6 +57,7 @@ import javax.persistence.Table;
import javax.persistence.TableGenerator;
import com.amazonaws.util.CollectionUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.log4j.Logger;
import com.cloud.utils.DateUtil;
@@ -2180,6 +2181,9 @@ public abstract class GenericDaoBase extends Compone
@Override
public List findByUuids(String... uuidArray) {
+if (ArrayUtils.isEmpty(uuidArray)) {
+return new ArrayList();
+}
SearchCriteria sc = createSearchCriteria();
sc.addAnd("uuid", SearchCriteria.Op.IN, uuidArray);
return search(sc, null);
(cloudstack-terraform-provider) branch main updated: .terraform-registry: remove v0.5.0 request
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git The following commit(s) were added to refs/heads/main by this push: new 77b6e81 .terraform-registry: remove v0.5.0 request 77b6e81 is described below commit 77b6e811fdec5858cd11c7d7ce1ddffb04816977 Author: Rohit Yadav AuthorDate: Tue Apr 16 11:58:08 2024 +0530 .terraform-registry: remove v0.5.0 request Signed-off-by: Rohit Yadav --- .terraform-registry | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.terraform-registry b/.terraform-registry index 6c304e4..18217cb 100644 --- a/.terraform-registry +++ b/.terraform-registry @@ -1,4 +1,4 @@ -Request: change owner to Github user rohityadavcloud +Request: remove version v0.5.0 from the registry Registry Link: https://registry.terraform.io/providers/cloudstack/cloudstack/latest Request by: rohit.ya...@shapeblue.com, ro...@apache.org -Request number: 143448 +Request number: 146118
(cloudstack-docs-rn) branch master updated: Update rnotes.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 05ec924 Update rnotes.po 05ec924 is described below commit 05ec924c64e7a0d8e94823aceb0c59405bcf6a80 Author: Rohit Yadav AuthorDate: Mon Apr 15 14:01:46 2024 +0530 Update rnotes.po --- source/locale/ja/LC_MESSAGES/rnotes.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/locale/ja/LC_MESSAGES/rnotes.po b/source/locale/ja/LC_MESSAGES/rnotes.po index e53f851..813f69c 100644 --- a/source/locale/ja/LC_MESSAGES/rnotes.po +++ b/source/locale/ja/LC_MESSAGES/rnotes.po @@ -205,7 +205,7 @@ msgstr "" #: ../../source/rnotes.rst:1256 ../../source/rnotes.rst:1674 #: ../../source/rnotes.rst:2499 msgid "" -"URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14; +"URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14; "-master-xen.vhd.bz2" msgstr "" @@ -426,7 +426,7 @@ msgstr "" #: ../../source/rnotes.rst:1281 ../../source/rnotes.rst:1700 #: ../../source/rnotes.rst:2524 msgid "" -"URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14; +"URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14; "-master-kvm.qcow2.bz2" msgstr "" @@ -494,7 +494,7 @@ msgstr "" #: ../../source/rnotes.rst:1306 ../../source/rnotes.rst:1726 #: ../../source/rnotes.rst:2549 msgid "" -"URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14; +"URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14; "-master-vmware.ova" msgstr "" @@ -2163,7 +2163,7 @@ msgstr "" msgid "" "If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by using " "the instructions in the `2.2.14 Release Notes " -"<http://download.cloud.com/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`__." +"<http://download.cloudstack.org/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`__." msgstr "" # 43af6a2f821148dc933817dda7004642
(cloudstack-docs-rn) branch master updated: Update upgrade-4.2.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new b512d45 Update upgrade-4.2.rst b512d45 is described below commit b512d4529da7d1602eb42ceae8f4ba6760cdb180 Author: Rohit Yadav AuthorDate: Mon Apr 15 14:01:06 2024 +0530 Update upgrade-4.2.rst --- source/upgrade/upgrade-4.2.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.2.rst b/source/upgrade/upgrade-4.2.rst index daa5bac..d17ab33 100644 --- a/source/upgrade/upgrade-4.2.rst +++ b/source/upgrade/upgrade-4.2.rst @@ -248,13 +248,13 @@ Hypervisor: Xen/XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util .. include:: _xenserver_upg.rst
(cloudstack-docs-rn) branch master updated: Update upgrade-4.5.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 65e317b Update upgrade-4.5.rst 65e317b is described below commit 65e317be0bcf4e764f4f7c0b586d14e850c69213 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:58:45 2024 +0530 Update upgrade-4.5.rst --- source/upgrade/upgrade-4.5.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.5.rst b/source/upgrade/upgrade-4.5.rst index b8f0038..245dc9c 100644 --- a/source/upgrade/upgrade-4.5.rst +++ b/source/upgrade/upgrade-4.5.rst @@ -254,13 +254,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.8.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 875ad84 Update upgrade-4.8.rst 875ad84 is described below commit 875ad84850f2fd6b28e1ed5d8a399d2371ff98c4 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:58:24 2024 +0530 Update upgrade-4.8.rst --- source/upgrade/upgrade-4.8.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.8.rst b/source/upgrade/upgrade-4.8.rst index d6e97d6..0561f58 100644 --- a/source/upgrade/upgrade-4.8.rst +++ b/source/upgrade/upgrade-4.8.rst @@ -248,13 +248,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.11.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 0e2ef7f Update upgrade-4.11.rst 0e2ef7f is described below commit 0e2ef7f2260a9f6235ceb8464d28d87831dc566d Author: Rohit Yadav AuthorDate: Mon Apr 15 13:58:07 2024 +0530 Update upgrade-4.11.rst --- source/upgrade/upgrade-4.11.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.11.rst b/source/upgrade/upgrade-4.11.rst index 71946e4..b578b33 100644 --- a/source/upgrade/upgrade-4.11.rst +++ b/source/upgrade/upgrade-4.11.rst @@ -247,13 +247,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.6.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new b1fec6c Update upgrade-4.6.rst b1fec6c is described below commit b1fec6c8fcdd911a033133cfda5282d5125669c5 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:57:49 2024 +0530 Update upgrade-4.6.rst --- source/upgrade/upgrade-4.6.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.6.rst b/source/upgrade/upgrade-4.6.rst index cde2160..879cd85 100644 --- a/source/upgrade/upgrade-4.6.rst +++ b/source/upgrade/upgrade-4.6.rst @@ -252,13 +252,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.7.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new a96f3e6 Update upgrade-4.7.rst a96f3e6 is described below commit a96f3e6169e475d78942dc9f54171cdf848e5142 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:57:05 2024 +0530 Update upgrade-4.7.rst --- source/upgrade/upgrade-4.7.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.7.rst b/source/upgrade/upgrade-4.7.rst index 40f0572..3bc862a 100644 --- a/source/upgrade/upgrade-4.7.rst +++ b/source/upgrade/upgrade-4.7.rst @@ -245,13 +245,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.4.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new b561b54 Update upgrade-4.4.rst b561b54 is described below commit b561b544534499d9aeecbf5a779ac45e85031067 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:59:05 2024 +0530 Update upgrade-4.4.rst --- source/upgrade/upgrade-4.4.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.4.rst b/source/upgrade/upgrade-4.4.rst index 6289efe..d53ad2d 100644 --- a/source/upgrade/upgrade-4.4.rst +++ b/source/upgrade/upgrade-4.4.rst @@ -254,13 +254,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util .. include:: _xenserver_upg.rst
(cloudstack-docs-rn) branch master updated: Update upgrade-4.10.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new a47713b Update upgrade-4.10.rst a47713b is described below commit a47713b75ea69cb2f8d0db4d23b5ed7f413f2768 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:57:27 2024 +0530 Update upgrade-4.10.rst --- source/upgrade/upgrade-4.10.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.10.rst b/source/upgrade/upgrade-4.10.rst index 3441a4e..b0f7399 100644 --- a/source/upgrade/upgrade-4.10.rst +++ b/source/upgrade/upgrade-4.10.rst @@ -252,13 +252,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-rn) branch master updated: Update upgrade-4.3.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new dcabbf9 Update upgrade-4.3.rst dcabbf9 is described below commit dcabbf9b1a8f6568b3390780e014236680cc3041 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:56:38 2024 +0530 Update upgrade-4.3.rst --- source/upgrade/upgrade-4.3.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.3.rst b/source/upgrade/upgrade-4.3.rst index 3843238..bf06177 100644 --- a/source/upgrade/upgrade-4.3.rst +++ b/source/upgrade/upgrade-4.3.rst @@ -252,13 +252,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util .. include:: _xenserver_upg.rst
(cloudstack-docs-rn) branch master updated: Update rnotes.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 5e29089 Update rnotes.pot 5e29089 is described below commit 5e2908940460fdcf8528c66f2bd6b4adf918bc82 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:56:03 2024 +0530 Update rnotes.pot --- source/locale/pot/rnotes.pot | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/locale/pot/rnotes.pot b/source/locale/pot/rnotes.pot index e1f188b..a2f3f09 100644 --- a/source/locale/pot/rnotes.pot +++ b/source/locale/pot/rnotes.pot @@ -213,7 +213,7 @@ msgstr "" # a8b209e329fc41ce94ec334acd8dc4d0 # a26c20ade808412ab062e4a910efcde5 # bfaf491e156c4f9ab1e381a756900595 -msgid "URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2; +msgid "URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2; msgstr "" #: ../../rnotes.rst:78 @@ -483,7 +483,7 @@ msgstr "" # b11d6d74b8e340d2af1246f535bed9e1 # 9ded492ee518410f88bfa49eab1e31b8 # 3fb14024946f4d70b472ccc0fa7b876a -msgid "URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2; +msgid "URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2; msgstr "" #: ../../rnotes.rst:105 @@ -561,7 +561,7 @@ msgstr "" # c5214485e9114e2eb71127c7d7de6965 # 0c755ceff7c547348ff3a27a613ef83a # a56695f39bb84f899e7915122a3c430a -msgid "URL: http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova; +msgid "URL: http://download.cloudstack.org/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova; msgstr "" #: ../../rnotes.rst:130 @@ -2009,7 +2009,7 @@ msgstr "" #: ../../rnotes.rst:2456 # 0f112aff5e3a40229d261d3025697c2a -msgid "If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by using the instructions in the `2.2.14 Release Notes <http://download.cloud.com/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`__." +msgid "If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by using the instructions in the `2.2.14 Release Notes <http://download.cloudstack.org/releases/2.2.0/CloudStack2.2.14ReleaseNotes.pdf>`__." msgstr "" #: ../../rnotes.rst:2460
(cloudstack-docs-rn) branch master updated: Update upgrade-4.9.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-rn.git The following commit(s) were added to refs/heads/master by this push: new 24845f3 Update upgrade-4.9.rst 24845f3 is described below commit 24845f37b5770cd73dfc29d52275ea739a47c4a6 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:54:03 2024 +0530 Update upgrade-4.9.rst --- source/upgrade/upgrade-4.9.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/upgrade/upgrade-4.9.rst b/source/upgrade/upgrade-4.9.rst index 7f6af71..3f79dd6 100644 --- a/source/upgrade/upgrade-4.9.rst +++ b/source/upgrade/upgrade-4.9.rst @@ -248,13 +248,13 @@ Hypervisor: XenServer - **(XenServer only)** Copy vhd-utils file on CloudStack management servers. -Copy the file `vhd-utils <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ +Copy the file `vhd-utils <http://download.cloudstack.org/tools/vhd-util>`_ to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``. .. sourcecode:: bash wget -P /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver \ - http://download.cloud.com.s3.amazonaws.com/tools/vhd-util + http://download.cloudstack.org/tools/vhd-util Hypervisor: VMware
(cloudstack-docs-install) branch master updated: Update hypervisor_installation.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 2874c93 Update hypervisor_installation.pot 2874c93 is described below commit 2874c93a2bae452e477870752599d49d6226610c Author: Rohit Yadav AuthorDate: Mon Apr 15 13:52:14 2024 +0530 Update hypervisor_installation.pot --- source/locale/pot/hypervisor_installation.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/locale/pot/hypervisor_installation.pot b/source/locale/pot/hypervisor_installation.pot index 180fcff..b904b91 100644 --- a/source/locale/pot/hypervisor_installation.pot +++ b/source/locale/pot/hypervisor_installation.pot @@ -1385,7 +1385,7 @@ msgstr "" #: ../../hypervisor_installation.rst:1181 # 54880e3acb4945b4ae3d3fb251252130 -msgid "`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor_installation.rst:1183 @@ -1395,7 +1395,7 @@ msgstr "" #: ../../hypervisor_installation.rst:1185 # b1533b01dec04d8ea37cb07d541d8013 -msgid "`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor_installation.rst:1187 @@ -1405,7 +1405,7 @@ msgstr "" #: ../../hypervisor_installation.rst:1189 # bc80c4fa363248c292882b511d90808a -msgid "`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor_installation.rst:1193
(cloudstack-docs-install) branch master updated: Update hypervisor_installation.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new d579331 Update hypervisor_installation.po d579331 is described below commit d579331e26643c2a18be1b5bdac8b4505ec57683 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:51:51 2024 +0530 Update hypervisor_installation.po --- .../zh_CN/LC_MESSAGES/hypervisor_installation.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po b/source/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po index dcbb0b5..946637b 100644 --- a/source/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po +++ b/source/locale/zh_CN/LC_MESSAGES/hypervisor_installation.po @@ -1565,10 +1565,10 @@ msgstr "适用于XenServer 6.0.2：" # 54880e3acb4945b4ae3d3fb251252130 #: ../../hypervisor_installation.rst:1181 msgid "" -"`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-; +"`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-; "supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" # 4405c659cea34cb2895c0f43693473f1 #: ../../hypervisor_installation.rst:1183 @@ -1578,9 +1578,9 @@ msgstr "适用于XenServer 5.6 SP2:" # b1533b01dec04d8ea37cb07d541d8013 #: ../../hypervisor_installation.rst:1185 msgid "" -"`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +"`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" # 994df5c8945149b7b8663a2e603fc847 #: ../../hypervisor_installation.rst:1187 @@ -1590,9 +1590,9 @@ msgstr "适用于XenServer 6.0:" # bc80c4fa363248c292882b511d90808a #: ../../hypervisor_installation.rst:1189 msgid "" -"`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" +"`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" # 09db532336c943caa7e4713f7f57deaa #: ../../hypervisor_installation.rst:1193
(cloudstack-docs-install) branch master updated: Update building_from_source.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 527e03d Update building_from_source.po 527e03d is described below commit 527e03d30ec7c85b543df62dfa5166463b2e58d6 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:51:22 2024 +0530 Update building_from_source.po --- source/locale/zh_CN/LC_MESSAGES/building_from_source.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/locale/zh_CN/LC_MESSAGES/building_from_source.po b/source/locale/zh_CN/LC_MESSAGES/building_from_source.po index ce68b1a..10964e3 100644 --- a/source/locale/zh_CN/LC_MESSAGES/building_from_source.po +++ b/source/locale/zh_CN/LC_MESSAGES/building_from_source.po @@ -561,10 +561,10 @@ msgstr "由于这些模块需要的依赖项不能和CloudStack一起发行， #: ../../building_from_source.rst:446 msgid "" "You may also need to download `vhd-util " -"<http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, which was " +"<http://download.cloudstack.org/tools/vhd-util>`_, which was " "removed due to licensing issues. You'll copy vhd-util to the " "``scripts/vm/hypervisor/xenserver/`` directory." -msgstr "你可能还需要下载`vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, 也是由于授权问题而被移除。 复制vhd-util到该目录： ``scripts/vm/hypervisor/xenserver/``." +msgstr "你可能还需要下载`vhd-util <http://download.cloudstack.org/tools/vhd-util>`_, 也是由于授权问题而被移除。 复制vhd-util到该目录： ``scripts/vm/hypervisor/xenserver/``." # bfbd7215ff0345f183a7946f620b1368 #: ../../building_from_source.rst:451
(cloudstack-docs-install) branch master updated: Update xenserver.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 117c28a Update xenserver.po 117c28a is described below commit 117c28a65f3972e42f71782797bbd35e79fd3c99 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:50:22 2024 +0530 Update xenserver.po --- .../locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po b/source/locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po index d87ecf4..7d5f9dd 100644 --- a/source/locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po +++ b/source/locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po @@ -302,10 +302,10 @@ msgstr "适用于XenServer 6.0.2：" # c7d858231a3142109c09bfcc3340078b #: ../../hypervisor/xenserver.rst:193 msgid "" -"`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-; +"`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-; "supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" # 2cbbc4bcdcdd42d0816a6b2df748a0d6 #: ../../hypervisor/xenserver.rst:196 @@ -315,9 +315,9 @@ msgstr "适用于XenServer 5.6 SP2:" # beac106ea20e420cae0ca5acb450646b #: ../../hypervisor/xenserver.rst:198 msgid "" -"`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +"`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" # 62cd9713906c45dc96254605c7134b11 #: ../../hypervisor/xenserver.rst:201 @@ -327,9 +327,9 @@ msgstr "适用于XenServer 6.0:" # 998fd323b14c42149cc6633f4df39b83 #: ../../hypervisor/xenserver.rst:203 msgid "" -"`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz " -"<http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" -msgstr "`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" +"`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz " +"<http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" +msgstr "`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" # 50f6122c6c5e42dbb34f5942e788bd76 #: ../../hypervisor/xenserver.rst:207
(cloudstack-docs-install) branch master updated: Update installation.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 75ed809 Update installation.po 75ed809 is described below commit 75ed809ae6bcacf5f22e837c2939c7ad7a364941 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:50:55 2024 +0530 Update installation.po --- source/locale/zh_CN/LC_MESSAGES/installation.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/locale/zh_CN/LC_MESSAGES/installation.po b/source/locale/zh_CN/LC_MESSAGES/installation.po index 7ea4ad0..a3d558c 100644 --- a/source/locale/zh_CN/LC_MESSAGES/installation.po +++ b/source/locale/zh_CN/LC_MESSAGES/installation.po @@ -591,8 +591,8 @@ msgstr "这个步骤仅适用于安装了XenServer的hypervisor主机。" #: ../../installation.rst:358 msgid "" "Before setting up the Management Server, download vhd-util from `vhd-util " -"<http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_." -msgstr "在设置管理服务器前，下载 `vhd-util<http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_." +"<http://download.cloudstack.org/tools/vhd-util>`_." +msgstr "在设置管理服务器前，下载 `vhd-util<http://download.cloudstack.org/tools/vhd-util>`_." # d4c4d9a792ec46bbacc984b02fa8dd22 #: ../../installation.rst:361 @@ -1409,8 +1409,8 @@ msgstr "这个步骤仅适用于安装了XenServer的hypervisor主机。" #: ../../installation.rst:1085 msgid "" "Download vhd-util from `vhd-util " -"<http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_" -msgstr "下载 `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_" +"<http://download.cloudstack.org/tools/vhd-util>`_" +msgstr "下载 `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_" # 3b0ff1adaf804ec4b60b43307747e306 #: ../../installation.rst:1088
(cloudstack-docs-install) branch master updated: Update building_from_source.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 7380e90 Update building_from_source.pot 7380e90 is described below commit 7380e9053f2f083ae464ed552625ef4e17f34c63 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:49:51 2024 +0530 Update building_from_source.pot --- source/locale/pot/building_from_source.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/locale/pot/building_from_source.pot b/source/locale/pot/building_from_source.pot index 1433375..1d6582f 100644 --- a/source/locale/pot/building_from_source.pot +++ b/source/locale/pot/building_from_source.pot @@ -418,7 +418,7 @@ msgstr "" #: ../../building_from_source.rst:446 # d9d9d34be2604c18a3b9107dbf384181 -msgid "You may also need to download `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, which was removed due to licensing issues. You'll copy vhd-util to the ``scripts/vm/hypervisor/xenserver/`` directory." +msgid "You may also need to download `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_, which was removed due to licensing issues. You'll copy vhd-util to the ``scripts/vm/hypervisor/xenserver/`` directory." msgstr "" #: ../../building_from_source.rst:451
(cloudstack-docs-install) branch master updated: Update building_from_source.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 80b7958 Update building_from_source.rst 80b7958 is described below commit 80b79589e0cb75277ca618b568b73bf11cde7110 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:49:19 2024 +0530 Update building_from_source.rst --- source/building_from_source.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/building_from_source.rst b/source/building_from_source.rst index 7b4fd99..9a7d1e2 100644 --- a/source/building_from_source.rst +++ b/source/building_from_source.rst @@ -487,7 +487,7 @@ to build from source. page on the wiki. #. You may also need to download - `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, + `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_, which was removed due to licensing issues. You'll copy vhd-util to the ``scripts/vm/hypervisor/xenserver/`` directory.
(cloudstack-docs-install) branch master updated: Update installation.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new c1ef28d Update installation.pot c1ef28d is described below commit c1ef28d3776213de93047fd98b3d0e18f4c0f03e Author: Rohit Yadav AuthorDate: Mon Apr 15 13:49:00 2024 +0530 Update installation.pot --- source/locale/pot/installation.pot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/locale/pot/installation.pot b/source/locale/pot/installation.pot index 11b4ccf..2c8a5b6 100644 --- a/source/locale/pot/installation.pot +++ b/source/locale/pot/installation.pot @@ -495,7 +495,7 @@ msgstr "" #: ../../installation.rst:358 # d212ae279e594ea4a9b82dde3342f509 -msgid "Before setting up the Management Server, download vhd-util from `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_." +msgid "Before setting up the Management Server, download vhd-util from `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_." msgstr "" #: ../../installation.rst:361 @@ -1079,7 +1079,7 @@ msgstr "" #: ../../installation.rst:1085 # 60bd480d13124c16b4c8774b8abd5439 -msgid "Download vhd-util from `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_" +msgid "Download vhd-util from `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_" msgstr "" #: ../../installation.rst:1088
(cloudstack-docs-install) branch master updated: Update xenserver.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 8ae5b50 Update xenserver.pot 8ae5b50 is described below commit 8ae5b50fd93bd6c8085bf363bebdd8c352dcd3c3 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:48:12 2024 +0530 Update xenserver.pot --- source/locale/pot/hypervisor/xenserver.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/locale/pot/hypervisor/xenserver.pot b/source/locale/pot/hypervisor/xenserver.pot index 7c7a65b..ab6ae7e 100644 --- a/source/locale/pot/hypervisor/xenserver.pot +++ b/source/locale/pot/hypervisor/xenserver.pot @@ -253,7 +253,7 @@ msgstr "" #: ../../hypervisor/xenserver.rst:193 # c7d858231a3142109c09bfcc3340078b -msgid "`http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor/xenserver.rst:196 @@ -263,7 +263,7 @@ msgstr "" #: ../../hypervisor/xenserver.rst:198 # beac106ea20e420cae0ca5acb450646b -msgid "`http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor/xenserver.rst:201 @@ -273,7 +273,7 @@ msgstr "" #: ../../hypervisor/xenserver.rst:203 # 998fd323b14c42149cc6633f4df39b83 -msgid "`http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_" +msgid "`http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz <http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_" msgstr "" #: ../../hypervisor/xenserver.rst:207
(cloudstack-docs-install) branch master updated: Update xenserver.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 116aec5 Update xenserver.rst 116aec5 is described below commit 116aec5c4cc35e2dad0898a8f7c973fd4402b74c Author: Rohit Yadav AuthorDate: Mon Apr 15 13:47:45 2024 +0530 Update xenserver.rst --- source/hypervisor/xenserver.rst | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/hypervisor/xenserver.rst b/source/hypervisor/xenserver.rst index e5b50a2..e8d22ea 100644 --- a/source/hypervisor/xenserver.rst +++ b/source/hypervisor/xenserver.rst @@ -191,18 +191,18 @@ CSP functionality is already present in XenServer 6.1 For XenServer 6.0.2: - `http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz - <http://download.cloud.com/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_ + `http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz + <http://download.cloudstack.org/releases/3.0.1/XS-6.0.2/xenserver-cloud-supp.tgz>`_ For XenServer 5.6 SP2: - `http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz - <http://download.cloud.com/releases/2.2.0/xenserver-cloud-supp.tgz>`_ + `http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz + <http://download.cloudstack.org/releases/2.2.0/xenserver-cloud-supp.tgz>`_ For XenServer 6.0: - `http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz - <http://download.cloud.com/releases/3.0/xenserver-cloud-supp.tgz>`_ + `http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz + <http://download.cloudstack.org/releases/3.0/xenserver-cloud-supp.tgz>`_ #. Extract the file:
(cloudstack-docs-install) branch master updated: Update _second_mgt.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 81b95df Update _second_mgt.rst 81b95df is described below commit 81b95df730787ce208abb602df6f1e7766382f6d Author: Rohit Yadav AuthorDate: Mon Apr 15 13:47:21 2024 +0530 Update _second_mgt.rst --- source/management-server/_second_mgt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/management-server/_second_mgt.rst b/source/management-server/_second_mgt.rst index a4bd467..5897919 100644 --- a/source/management-server/_second_mgt.rst +++ b/source/management-server/_second_mgt.rst @@ -30,7 +30,7 @@ OS for the Management Server. installed on the hypervisor hosts. Download vhd-util from - `vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ + `vhd-util <http://download.cloudstack.org/tools/vhd-util>`_ Copy vhd-util to ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver``.
(cloudstack-docs-install) branch master updated: Update _vhd-util.rst
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-install.git The following commit(s) were added to refs/heads/master by this push: new 8172fa2 Update _vhd-util.rst 8172fa2 is described below commit 8172fa2581dba05953768b9b38c7068c7e1a1398 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:46:54 2024 +0530 Update _vhd-util.rst --- source/management-server/_vhd-util.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/management-server/_vhd-util.rst b/source/management-server/_vhd-util.rst index a6ff015..e78d2ef 100644 --- a/source/management-server/_vhd-util.rst +++ b/source/management-server/_vhd-util.rst @@ -20,7 +20,7 @@ This procedure is required only for installations where XenServer is installed on the hypervisor hosts. Before setting up the Management Server, download -`vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_ from -http://download.cloud.com.s3.amazonaws.com/tools/vhd-util. +`vhd-util <http://download.cloudstack.org/tools/vhd-util>`_ from +http://download.cloudstack.org/tools/vhd-util. and copy it into ``/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver`` -of the Management Server. \ No newline at end of file +of the Management Server.
(cloudstack-docs-admin) branch master updated: Update templates.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-admin.git The following commit(s) were added to refs/heads/master by this push: new 6906f4e Update templates.pot 6906f4e is described below commit 6906f4ea8e3b93ec9e3d0367cff11e54d7c23739 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:45:43 2024 +0530 Update templates.pot --- source/locale/pot/templates.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/locale/pot/templates.pot b/source/locale/pot/templates.pot index c8f33db..cdbd005 100644 --- a/source/locale/pot/templates.pot +++ b/source/locale/pot/templates.pot @@ -928,7 +928,7 @@ msgid "Download the script file cloud-set-guest-password:" msgstr "" #: ../../templates/_password.rst:51 -msgid "`http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_" +msgid "`http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in>`_" msgstr "" #: ../../templates/_password.rst:54
(cloudstack-docs-admin) branch master updated: Update _password.pot
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack-docs-admin.git The following commit(s) were added to refs/heads/master by this push: new 7bc274f Update _password.pot 7bc274f is described below commit 7bc274f922bb47039693ba920c16c3e99f219259 Author: Rohit Yadav AuthorDate: Mon Apr 15 13:45:04 2024 +0530 Update _password.pot --- source/locale/pot/templates/_password.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/locale/pot/templates/_password.pot b/source/locale/pot/templates/_password.pot index 712ffd1..cf24f3b 100644 --- a/source/locale/pot/templates/_password.pot +++ b/source/locale/pot/templates/_password.pot @@ -49,7 +49,7 @@ msgid "Download the script file cloud-set-guest-password:" msgstr "" #: ../../templates/_password.rst:51 -msgid "`http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_" +msgid "`http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in>`_" msgstr "" #: ../../templates/_password.rst:54
(cloudstack-terraform-provider) branch main updated: Update README.md (#110)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-terraform-provider.git The following commit(s) were added to refs/heads/main by this push: new 845e996 Update README.md (#110) 845e996 is described below commit 845e9962c4c7ff8c781a99bc9ce2cc5c89531c48 Author: CodeBleu <400979+codeb...@users.noreply.github.com> AuthorDate: Fri Apr 12 14:26:31 2024 -0400 Update README.md (#110) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74537a2..d7baa42 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ User hitting installation issue using registry can install using the local insta Documentation - -For more details on how to use the provider, visit https://registry.terraform.io/providers/cloudstack/cloudstack/latest/docs +For more details on how to use the provider, click [here](website/) or visit https://registry.terraform.io/providers/cloudstack/cloudstack/latest/docs Developing the Provider ---
(cloudstack) branch 4.19 updated: Allow overriding root disk offering & size, and expunge old root disk while restoring a VM (#8800)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new b998e7dbb63 Allow overriding root disk offering & size, and expunge
old root disk while restoring a VM (#8800)
b998e7dbb63 is described below
commit b998e7dbb6355c4165b00a2792062f2d446713dd
Author: Vishesh
AuthorDate: Fri Apr 12 17:47:52 2024 +0530
Allow overriding root disk offering & size, and expunge old root disk while
restoring a VM (#8800)
* Allow overriding root diskoffering id & size while restoring VM
* UI changes
* Allow expunging of old disk while restoring a VM
* Resolve comments
* Address comments
* Duplicate volume's details while duplicating volume
* Allow setting IOPS for the new volume
* minor cleanup
* fixup
* Add checks for template size
* Replace strings for IOPS with constants
* Fix saveVolumeDetails method
* Fixup
* Fixup UI styling
---
.../java/com/cloud/storage/VolumeApiService.java | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 2 +-
.../api/command/user/vm/RestoreVMCmd.java | 42 +++
.../java/com/cloud/vm/VirtualMachineManager.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java| 18 +-
.../src/main/java/com/cloud/vm/VmWorkRestore.java | 27 +-
.../engine/orchestration/CloudOrchestrator.java| 7 +-
.../engine/orchestration/VolumeOrchestrator.java | 39 ++-
.../com/cloud/storage/VolumeApiServiceImpl.java| 14 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 124 +++--
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 11 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 26 +-
ui/src/config/section/compute.js | 27 +-
ui/src/views/compute/ReinstallVm.vue | 307 +
14 files changed, 541 insertions(+), 107 deletions(-)
diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java
b/api/src/main/java/com/cloud/storage/VolumeApiService.java
index a673df12d0f..4f09702b7db 100644
--- a/api/src/main/java/com/cloud/storage/VolumeApiService.java
+++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java
@@ -175,6 +175,8 @@ public interface VolumeApiService {
boolean validateVolumeSizeInBytes(long size);
+void validateDestroyVolume(Volume volume, Account caller, boolean expunge,
boolean forceExpunge);
+
Volume changeDiskOfferingForVolume(ChangeOfferingForVolumeCmd cmd) throws
ResourceAllocationException;
void publishVolumeCreationUsageEvent(Volume volume);
diff --git a/api/src/main/java/com/cloud/vm/UserVmService.java
b/api/src/main/java/com/cloud/vm/UserVmService.java
index c32c099ed3a..787ed7bde37 100644
--- a/api/src/main/java/com/cloud/vm/UserVmService.java
+++ b/api/src/main/java/com/cloud/vm/UserVmService.java
@@ -492,7 +492,7 @@ public interface UserVmService {
UserVm restoreVM(RestoreVMCmd cmd) throws InsufficientCapacityException,
ResourceUnavailableException;
-UserVm restoreVirtualMachine(Account caller, long vmId, Long
newTemplateId) throws InsufficientCapacityException,
ResourceUnavailableException;
+UserVm restoreVirtualMachine(Account caller, long vmId, Long
newTemplateId, Long rootDiskOfferingId, boolean expunge, Map
details) throws InsufficientCapacityException, ResourceUnavailableException;
UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws
ResourceUnavailableException, ConcurrentOperationException,
ManagementServerException,
VirtualMachineMigrationException;
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
index 4b59bf560cb..17c4e97eb3b 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java
@@ -16,7 +16,9 @@
// under the License.
package org.apache.cloudstack.api.command.user.vm;
+import com.cloud.vm.VmDetailConstants;
import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -42,6 +44,8 @@ import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.vm.VirtualMachine;
+import java.util.Map;
+
@APICommand(name = "restoreVirtualMachine", description = "Restore a VM to
original template/ISO or new template/ISO", responseObject =
UserVmResponse.class, since = "3.0.0", responseView = ResponseView.Restricted,
entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false,
(cloudstack-www) branch main updated (64f429bd -> 238f412c)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from 64f429bd blog: announcement for terraform provider release add 238f412c update banner No new revisions were added by this update. Summary of changes: .../banner.jpg | Bin 57514 -> 79505 bytes 1 file changed, 0 insertions(+), 0 deletions(-)
(cloudstack-www) branch staging-site updated: update banner
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/staging-site by this push: new 238f412c update banner 238f412c is described below commit 238f412c225c95084b529434f50a7380ab266eff Author: Rohit Yadav AuthorDate: Fri Apr 12 16:20:03 2024 +0530 update banner Signed-off-by: Rohit Yadav --- .../banner.jpg | Bin 57514 -> 79505 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg index a53aa533..13a4c102 100644 Binary files a/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg and b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg differ
(cloudstack-www) branch staging-site updated: blog: announcement for terraform provider release
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch staging-site in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git The following commit(s) were added to refs/heads/staging-site by this push: new 64f429bd blog: announcement for terraform provider release 64f429bd is described below commit 64f429bdf68aad10656fd3d8a5d42bb2c5cc89b2 Author: Rohit Yadav AuthorDate: Fri Apr 12 14:58:55 2024 +0530 blog: announcement for terraform provider release Signed-off-by: Rohit Yadav --- .../banner.jpg | Bin 0 -> 57514 bytes .../index.md | 57 + 2 files changed, 57 insertions(+) diff --git a/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg new file mode 100644 index ..a53aa533 Binary files /dev/null and b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg differ diff --git a/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/index.md b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/index.md new file mode 100644 index ..ee085ed6 --- /dev/null +++ b/blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/index.md @@ -0,0 +1,57 @@ +--- +layout: post +title: Apache CloudStack Terraform 0.5.0 Release +tags: [announcement] +authors: [rohit] +slug: cloudstack-terraform-provider-0.5.0-release +--- + +[](/blog/cloudstack-terraform-provider-0.5.0-release) + +We are pleased to announce the release of Apache CloudStack Terraform +provider v0.5.0. Terraform is an open-source infrastructure as code software +tool that provides a consistent CLI workflow to manage resources in many +public/private clouds. + + + +Terraform v0.5.0 comes packed with several new features, enhancements, +and bug fixes to make it even more robust and reliable. + +Some of the key highlights of this release include: + +- Added support for Kubernetes Cluster creation +- Added support for Kubernetes iso registration +- Added support for new data sources in Cloudstack +- Added UEFI Support to the Cloudstack instance resource +- Added vApp properties support to the Cloudstack Instance resource +- Added parameters (host_id , cluster_id support to the Cloudstack instance resource +- Added source_nat_ip_address support to the Cloudstack network +- Added new resource attach_volume +- Improved service offering creation by adding more parameters +- Added documentation for new resources +- Various Bug fixes +- Validated and fixed all existing resource creations to work as expected + +Apache CloudStack Terraform provider v0.5.0 is available for +download now from the [Apache CloudStack +website](https://cloudstack.apache.org/downloads/#cloudstack-terraform-provider-release). + +Downloads and Documentation + +The official source code for Apache CloudStack Terraform provider can +be downloaded from: + +https://cloudstack.apache.org/downloads + +The installation and usage documentation for Apache CloudStack Terraform provider is available at: + +- https://github.com/apache/cloudstack-terraform-provider/wiki +- https://github.com/apache/cloudstack-terraform-provider/wiki#installing-from-github-release + +The documentation for the usage of resources to create and interact +with CloudStack is available at +https://registry.terraform.io/providers/cloudstack/cloudstack/0.5.0/docs + +Users can also get the provider from the Terraform registry published at: +https://registry.terraform.io/providers/cloudstack/cloudstack/0.5.0
(cloudstack-www) branch main updated (6eb7d94e -> 64f429bd)
This is an automated email from the ASF dual-hosted git repository. rohit pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-www.git from 6eb7d94e captial to lower case p add 64f429bd blog: announcement for terraform provider release No new revisions were added by this update. Summary of changes: .../banner.jpg | Bin .../index.md | 57 + 2 files changed, 57 insertions(+) copy static/img/imported/02633cc4-0d22-4bde-966e-4e3efec8f357 => blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/banner.jpg (100%) create mode 100644 blog/2024-04-12-cloudstack-terraform-provider-0.5.0-release/index.md
(cloudstack-documentation) branch main updated: replace download.cloud.com with download.cloudstack.org
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/main by this push: new fd50cb8 replace download.cloud.com with download.cloudstack.org fd50cb8 is described below commit fd50cb8c256d319e202c19c2facb18fb9e4e935f Author: Rohit Yadav AuthorDate: Thu Apr 11 22:09:07 2024 +0530 replace download.cloud.com with download.cloudstack.org Signed-off-by: Rohit Yadav --- source/adminguide/locale/pot/systemvm.pot | 4 ++-- source/adminguide/locale/pot/templates.pot | 2 +- source/adminguide/locale/zh_CN/LC_MESSAGES/systemvm.po | 8 .../adminguide/locale/zh_CN/LC_MESSAGES/templates.po | 6 +++--- source/developersguide/ansible.rst | 6 +++--- source/installguide/hypervisor/xenserver.rst | 12 ++-- .../installguide/locale/pot/hypervisor/xenserver.pot | 6 +++--- .../locale/pot/hypervisor_installation.pot | 6 +++--- .../locale/zh_CN/LC_MESSAGES/hypervisor/xenserver.po | 18 +- .../zh_CN/LC_MESSAGES/hypervisor_installation.po | 18 +- source/releasenotes/locale/ja/LC_MESSAGES/rnotes.po| 8 source/releasenotes/locale/pot/rnotes.pot | 8 source/upgrading/locale/ja/LC_MESSAGES/rnotes.po | 8 source/upgrading/locale/pot/rnotes.pot | 8 14 files changed, 59 insertions(+), 59 deletions(-) diff --git a/source/adminguide/locale/pot/systemvm.pot b/source/adminguide/locale/pot/systemvm.pot index 63cea3f..956c2fd 100644 --- a/source/adminguide/locale/pot/systemvm.pot +++ b/source/adminguide/locale/pot/systemvm.pot @@ -103,7 +103,7 @@ msgstr "" #: ../../systemvm.rst:66 # 6ea0f846b0a34711b7c0090cb48d8c32 -msgid "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2; +msgid "http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2; msgstr "" #: ../../systemvm.rst:67 @@ -113,7 +113,7 @@ msgstr "" #: ../../systemvm.rst:67 # fe251bca2b854129890cba8e7ac9bbbf -msgid "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2; +msgid "http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2; msgstr "" #: ../../systemvm.rst:70 diff --git a/source/adminguide/locale/pot/templates.pot b/source/adminguide/locale/pot/templates.pot index be9832f..e29f6e7 100644 --- a/source/adminguide/locale/pot/templates.pot +++ b/source/adminguide/locale/pot/templates.pot @@ -1160,7 +1160,7 @@ msgstr "" #: ../../templates.rst:1039 # 7dfc38f9a99c4d0bbb5007329350693e -msgid "`http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloud.com/templates/4.2/bindir/cloud-set-guest-password.in>`_" +msgid "`http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in <http://download.cloudstack.org/templates/4.2/bindir/cloud-set-guest-password.in>`_" msgstr "" #: ../../templates.rst:1042 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/systemvm.po b/source/adminguide/locale/zh_CN/LC_MESSAGES/systemvm.po index c880c7e..eb13e92 100644 --- a/source/adminguide/locale/zh_CN/LC_MESSAGES/systemvm.po +++ b/source/adminguide/locale/zh_CN/LC_MESSAGES/systemvm.po @@ -125,9 +125,9 @@ msgstr "XenServer" # 6ea0f846b0a34711b7c0090cb48d8c32 #: ../../systemvm.rst:66 msgid "" -"http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15; +"http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15; "-master-xen.vhd.bz2" -msgstr "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2; +msgstr "http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-xen.vhd.bz2; # e8a51da6f6614114a91e4006eedfc912 #: ../../systemvm.rst:67 @@ -137,9 +137,9 @@ msgstr "KVM" # fe251bca2b854129890cba8e7ac9bbbf #: ../../systemvm.rst:67 msgid "" -"http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15; +"http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15; "-master-kvm.qcow2.bz2" -msgstr "http://download.cloud.com/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2; +msgstr "http://download.cloudstack.org/templates/4.2/64bit/systemvmtemplate64-2013-07-15-master-kvm.qcow2.bz2; # 2d498240d20c4683ab11ac2232135a16 #: ../../systemvm.rst:70 diff --git a/source/adminguide/locale/zh_CN/LC_MESSAGES/templates.po b/source/adminguide/locale/zh_
(cloudstack-documentation) branch main updated: Update building_from_source.po
This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git The following commit(s) were added to refs/heads/main by this push: new ccc387e Update building_from_source.po ccc387e is described below commit ccc387e21d93b6503de6ceb28e6c7b286888 Author: Rohit Yadav AuthorDate: Thu Apr 11 21:59:16 2024 +0530 Update building_from_source.po --- source/installguide/locale/zh_CN/LC_MESSAGES/building_from_source.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/installguide/locale/zh_CN/LC_MESSAGES/building_from_source.po b/source/installguide/locale/zh_CN/LC_MESSAGES/building_from_source.po index ce68b1a..52332b3 100644 --- a/source/installguide/locale/zh_CN/LC_MESSAGES/building_from_source.po +++ b/source/installguide/locale/zh_CN/LC_MESSAGES/building_from_source.po @@ -561,10 +561,10 @@ msgstr "由于这些模块需要的依赖项不能和CloudStack一起发行， #: ../../building_from_source.rst:446 msgid "" "You may also need to download `vhd-util " -"<http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, which was " +"<https://download.cloudstack.org/tools/vhd-util>`_, which was " "removed due to licensing issues. You'll copy vhd-util to the " "``scripts/vm/hypervisor/xenserver/`` directory." -msgstr "你可能还需要下载`vhd-util <http://download.cloud.com.s3.amazonaws.com/tools/vhd-util>`_, 也是由于授权问题而被移除。 复制vhd-util到该目录： ``scripts/vm/hypervisor/xenserver/``." +msgstr "你可能还需要下载`vhd-util <https://download.cloudstack.org/tools/vhd-util>`_, 也是由于授权问题而被移除。 复制vhd-util到该目录： ``scripts/vm/hypervisor/xenserver/``." # bfbd7215ff0345f183a7946f620b1368 #: ../../building_from_source.rst:451
