Compare commits
6 Commits
915e02c3ac
...
af096f89fa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af096f89fa | ||
|
|
941227ec8c | ||
|
|
e7b8326058 | ||
|
|
024f89dc7d | ||
|
|
7ef5db2153 | ||
|
|
a2fcbd608a |
16
.github/workflows/license-templates/LICENSE.txt
vendored
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
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.
|
||||||
2
.github/workflows/linter.yml
vendored
@ -45,3 +45,5 @@ jobs:
|
|||||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||||
- name: Run pre-commit
|
- name: Run pre-commit
|
||||||
run: pre-commit run --all-files
|
run: pre-commit run --all-files
|
||||||
|
- name: Run manual pre-commit hooks
|
||||||
|
run: pre-commit run --all-files --hook-stage manual
|
||||||
|
|||||||
@ -25,12 +25,32 @@ repos:
|
|||||||
hooks:
|
hooks:
|
||||||
- id: identity
|
- id: identity
|
||||||
- id: check-hooks-apply
|
- id: check-hooks-apply
|
||||||
|
- repo: https://github.com/oxipng/oxipng
|
||||||
|
rev: v9.1.5
|
||||||
|
hooks:
|
||||||
|
- id: oxipng
|
||||||
|
name: run oxipng
|
||||||
|
description: optimize PNG images with lossless compression
|
||||||
|
args: ['-o', '4', '--strip', 'safe', '--alpha']
|
||||||
- repo: https://github.com/gitleaks/gitleaks
|
- repo: https://github.com/gitleaks/gitleaks
|
||||||
rev: v8.27.2
|
rev: v8.27.2
|
||||||
hooks:
|
hooks:
|
||||||
- id: gitleaks
|
- id: gitleaks
|
||||||
name: run gitleaks
|
name: run gitleaks
|
||||||
description: detect hardcoded secrets
|
description: detect hardcoded secrets
|
||||||
|
- repo: https://github.com/Lucas-C/pre-commit-hooks
|
||||||
|
rev: v1.5.5
|
||||||
|
hooks:
|
||||||
|
- id: insert-license
|
||||||
|
name: add license for all Markdown files
|
||||||
|
files: \.md$
|
||||||
|
args:
|
||||||
|
- --comment-style
|
||||||
|
- '<!--|| -->'
|
||||||
|
- --license-filepath
|
||||||
|
- .github/workflows/license-templates/LICENSE.txt
|
||||||
|
- --fuzzy-match-generates-todo
|
||||||
|
exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v6.0.0
|
rev: v6.0.0
|
||||||
hooks:
|
hooks:
|
||||||
@ -97,6 +117,14 @@ repos:
|
|||||||
args: [--config=.github/linters/.markdown-lint.yml]
|
args: [--config=.github/linters/.markdown-lint.yml]
|
||||||
types: [markdown]
|
types: [markdown]
|
||||||
files: \.(md|mdown|markdown)$
|
files: \.(md|mdown|markdown)$
|
||||||
|
- repo: https://github.com/Lucas-C/pre-commit-hooks
|
||||||
|
rev: v1.5.5
|
||||||
|
hooks:
|
||||||
|
- id: chmod
|
||||||
|
name: set file permissions
|
||||||
|
args: ['644']
|
||||||
|
files: \.md$
|
||||||
|
stages: [manual]
|
||||||
- repo: https://github.com/adrienverge/yamllint
|
- repo: https://github.com/adrienverge/yamllint
|
||||||
rev: v1.37.1
|
rev: v1.37.1
|
||||||
hooks:
|
hooks:
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Contributing to Apache CloudStack (ACS)
|
# Contributing to Apache CloudStack (ACS)
|
||||||
|
|
||||||
## Summary
|
## Summary
|
||||||
|
|||||||
19
INSTALL.md
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Apache CloudStack Installation basics
|
# Apache CloudStack Installation basics
|
||||||
|
|
||||||
This document describes how to develop, build, package and install Apache
|
This document describes how to develop, build, package and install Apache
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# pre-commit
|
# pre-commit
|
||||||
|
|
||||||
We run [pre-commit](https://pre-commit.com/) with
|
We run [pre-commit](https://pre-commit.com/) with
|
||||||
|
|||||||
21
README.md
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Apache CloudStack
|
# Apache CloudStack
|
||||||
|
|
||||||
[](https://github.com/apache/cloudstack/actions/workflows/build.yml)
|
[](https://github.com/apache/cloudstack/actions/workflows/build.yml)
|
||||||
@ -12,7 +31,7 @@
|
|||||||
|
|
||||||
[](https://cloudstack.apache.org/)
|
[](https://cloudstack.apache.org/)
|
||||||
|
|
||||||
Apache CloudStack is open source software designed to deploy and manage large
|
Apache CloudStack is open-source software designed to deploy and manage large
|
||||||
networks of virtual machines, as a highly available, highly scalable
|
networks of virtual machines, as a highly available, highly scalable
|
||||||
Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used
|
Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used
|
||||||
by a number of service providers to offer public cloud services, and by many
|
by a number of service providers to offer public cloud services, and by many
|
||||||
|
|||||||
@ -16,27 +16,10 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package org.apache.cloudstack.api.response;
|
package org.apache.cloudstack.api.response;
|
||||||
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
|
||||||
|
|
||||||
import org.apache.cloudstack.api.ApiConstants;
|
|
||||||
import org.apache.cloudstack.api.BaseResponse;
|
import org.apache.cloudstack.api.BaseResponse;
|
||||||
import org.apache.cloudstack.api.EntityReference;
|
import org.apache.cloudstack.api.EntityReference;
|
||||||
import org.apache.cloudstack.jobs.JobInfo;
|
import org.apache.cloudstack.jobs.JobInfo;
|
||||||
|
|
||||||
import com.cloud.serializer.Param;
|
|
||||||
|
|
||||||
@EntityReference(value = JobInfo.class)
|
@EntityReference(value = JobInfo.class)
|
||||||
@SuppressWarnings("unused")
|
|
||||||
public class UpgradeRouterTemplateResponse extends BaseResponse {
|
public class UpgradeRouterTemplateResponse extends BaseResponse {
|
||||||
@SerializedName(ApiConstants.JOB_ID)
|
|
||||||
@Param(description = "the id of AsyncJob")
|
|
||||||
private String asyncJobId;
|
|
||||||
|
|
||||||
public String getAsyncJobId() {
|
|
||||||
return asyncJobId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setAsyncJobId(String asyncJobId) {
|
|
||||||
this.asyncJobId = asyncJobId;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# CloudStack RPM and DEB packaging
|
# CloudStack RPM and DEB packaging
|
||||||
This directory contains all the required scripts and tools needed to build RPM and DEB packages for Apache CloudStack.
|
This directory contains all the required scripts and tools needed to build RPM and DEB packages for Apache CloudStack.
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Cloudian HyperStore Object Storage Plugin
|
# Cloudian HyperStore Object Storage Plugin
|
||||||
|
|
||||||
## Plugin Purpose
|
## Plugin Purpose
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# CloudStack Volume Provider Adaptive Plugin Base
|
# CloudStack Volume Provider Adaptive Plugin Base
|
||||||
|
|
||||||
The Adaptive Plugin Base is an abstract volume storage provider that
|
The Adaptive Plugin Base is an abstract volume storage provider that
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
All notable changes to Linstor CloudStack plugin will be documented in this file.
|
All notable changes to Linstor CloudStack plugin will be documented in this file.
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# StorPool CloudStack Integration
|
# StorPool CloudStack Integration
|
||||||
|
|
||||||
## CloudStack Overview
|
## CloudStack Overview
|
||||||
|
|||||||
10
pom.xml
@ -1016,7 +1016,6 @@
|
|||||||
<exclude>**/.vagrant</exclude>
|
<exclude>**/.vagrant</exclude>
|
||||||
<exclude>**/*.json</exclude>
|
<exclude>**/*.json</exclude>
|
||||||
<exclude>**/.checkstyle</exclude>
|
<exclude>**/.checkstyle</exclude>
|
||||||
<exclude>**/*.md</exclude>
|
|
||||||
<exclude>.java-version</exclude>
|
<exclude>.java-version</exclude>
|
||||||
<exclude>.python-version</exclude>
|
<exclude>.python-version</exclude>
|
||||||
<exclude>.idea/</exclude>
|
<exclude>.idea/</exclude>
|
||||||
@ -1026,10 +1025,8 @@
|
|||||||
<exclude>.gitignore</exclude>
|
<exclude>.gitignore</exclude>
|
||||||
<exclude>.markdownlintignore</exclude>
|
<exclude>.markdownlintignore</exclude>
|
||||||
<exclude>CHANGES.md</exclude>
|
<exclude>CHANGES.md</exclude>
|
||||||
<exclude>CONTRIBUTING.md</exclude>
|
<exclude>ISSUE_TEMPLATE.md</exclude>
|
||||||
<exclude>README.md</exclude>
|
<exclude>PULL_REQUEST_TEMPLATE.md</exclude>
|
||||||
<exclude>INSTALL.md</exclude>
|
|
||||||
<exclude>PRE-COMMIT.md</exclude>
|
|
||||||
<exclude>build/build.number</exclude>
|
<exclude>build/build.number</exclude>
|
||||||
<exclude>debian/cloudstack-agent.dirs</exclude>
|
<exclude>debian/cloudstack-agent.dirs</exclude>
|
||||||
<exclude>debian/cloudstack-usage.dirs</exclude>
|
<exclude>debian/cloudstack-usage.dirs</exclude>
|
||||||
@ -1057,7 +1054,6 @@
|
|||||||
<exclude>systemvm/agent/packages/**</exclude>
|
<exclude>systemvm/agent/packages/**</exclude>
|
||||||
<exclude>systemvm/debian/**</exclude>
|
<exclude>systemvm/debian/**</exclude>
|
||||||
<exclude>test/integration/component/test_host_ha.sh</exclude>
|
<exclude>test/integration/component/test_host_ha.sh</exclude>
|
||||||
<exclude>test/systemvm/README.md</exclude>
|
|
||||||
<exclude>tools/appliance/*/template.json</exclude>
|
<exclude>tools/appliance/*/template.json</exclude>
|
||||||
<exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
|
<exclude>tools/cli/cloudmonkey.egg-info/*</exclude>
|
||||||
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
|
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
|
||||||
@ -1071,6 +1067,8 @@
|
|||||||
<exclude>tools/transifex/.tx/config</exclude>
|
<exclude>tools/transifex/.tx/config</exclude>
|
||||||
<exclude>ui/.*</exclude>
|
<exclude>ui/.*</exclude>
|
||||||
<exclude>ui/.*/**</exclude>
|
<exclude>ui/.*/**</exclude>
|
||||||
|
<exclude>ui/docs/full-test-plan.template.md</exclude>
|
||||||
|
<exclude>ui/docs/smoke-test-plan.template.md</exclude>
|
||||||
<exclude>ui/src/assets/**</exclude>
|
<exclude>ui/src/assets/**</exclude>
|
||||||
<exclude>ui/public/**</exclude>
|
<exclude>ui/public/**</exclude>
|
||||||
<exclude>ui/legacy/**</exclude>
|
<exclude>ui/legacy/**</exclude>
|
||||||
|
|||||||
@ -4994,7 +4994,7 @@ public class ApiResponseHelper implements ResponseGenerator {
|
|||||||
for (Long jobId : jobIds) {
|
for (Long jobId : jobIds) {
|
||||||
UpgradeRouterTemplateResponse routerResponse = new UpgradeRouterTemplateResponse();
|
UpgradeRouterTemplateResponse routerResponse = new UpgradeRouterTemplateResponse();
|
||||||
AsyncJob job = _entityMgr.findById(AsyncJob.class, jobId);
|
AsyncJob job = _entityMgr.findById(AsyncJob.class, jobId);
|
||||||
routerResponse.setAsyncJobId((job.getUuid()));
|
routerResponse.setJobId((job.getUuid()));
|
||||||
routerResponse.setObjectName("asyncjobs");
|
routerResponse.setObjectName("asyncjobs");
|
||||||
responses.add(routerResponse);
|
responses.add(routerResponse);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -168,6 +168,7 @@ import com.cloud.vm.dao.UserVmDao;
|
|||||||
import com.cloud.vm.dao.VMInstanceDao;
|
import com.cloud.vm.dao.VMInstanceDao;
|
||||||
import com.cloud.vm.dao.VMInstanceDetailsDao;
|
import com.cloud.vm.dao.VMInstanceDetailsDao;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.GsonBuilder;
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
|
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
@ -399,7 +400,8 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
|
|||||||
settings.put(detail.getName(), detail.getValue());
|
settings.put(detail.getName(), detail.getValue());
|
||||||
}
|
}
|
||||||
if (!settings.isEmpty()) {
|
if (!settings.isEmpty()) {
|
||||||
details.put(ApiConstants.VM_SETTINGS, new Gson().toJson(settings));
|
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
|
||||||
|
details.put(ApiConstants.VM_SETTINGS, gson.toJson(settings));
|
||||||
}
|
}
|
||||||
|
|
||||||
String nicsJson = getNicDetailsAsJson(vm.getId());
|
String nicsJson = getNicDetailsAsJson(vm.getId());
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 352 B |
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 264 B |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 413 B |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 434 B |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 335 B After Width: | Height: | Size: 241 B |
|
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 157 B |
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 399 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 191 B After Width: | Height: | Size: 134 B |
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 331 B |
|
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 238 B |
|
Before Width: | Height: | Size: 348 B After Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 267 B |
|
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 127 B |
|
Before Width: | Height: | Size: 280 B After Width: | Height: | Size: 200 B |
|
Before Width: | Height: | Size: 126 B After Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 123 B After Width: | Height: | Size: 91 B |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 675 B After Width: | Height: | Size: 439 B |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 1000 B After Width: | Height: | Size: 730 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 809 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 448 B After Width: | Height: | Size: 296 B |
|
Before Width: | Height: | Size: 308 B After Width: | Height: | Size: 217 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 300 B |
|
Before Width: | Height: | Size: 379 B After Width: | Height: | Size: 241 B |
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 190 B After Width: | Height: | Size: 144 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 238 B |
|
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 216 B |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 158 B |
19
systemvm/agent/noVNC/vendor/pako/README.md
vendored
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
This is an ES6-modules-compatible version of
|
This is an ES6-modules-compatible version of
|
||||||
https://github.com/nodeca/pako, based on pako version 1.0.3.
|
https://github.com/nodeca/pako, based on pako version 1.0.3.
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Linstor storage plugin
|
# Linstor storage plugin
|
||||||
|
|
||||||
This directory contains the basic VM, Volume life cycle tests for Linstor storage pool (in KVM hypervisor).
|
This directory contains the basic VM, Volume life cycle tests for Linstor storage pool (in KVM hypervisor).
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# PowerFlex/ScaleIO storage plugin
|
# PowerFlex/ScaleIO storage plugin
|
||||||
|
|
||||||
This directory contains the basic VM, Volume life cycle tests for PowerFlex/ScaleIO storage pool (in KVM hypervisor).
|
This directory contains the basic VM, Volume life cycle tests for PowerFlex/ScaleIO storage pool (in KVM hypervisor).
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Requirements
|
# Requirements
|
||||||
|
|
||||||
To run these tests, first get the vagrant setup for the systemvm working,
|
To run these tests, first get the vagrant setup for the systemvm working,
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 5.2 KiB |
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Devcloud 4
|
# Devcloud 4
|
||||||
|
|
||||||
## Introduction
|
## Introduction
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
### Configure virtualbox
|
### Configure virtualbox
|
||||||
|
|
||||||
1. Open virtualbox and navigate to its preferences/settings window.
|
1. Open virtualbox and navigate to its preferences/settings window.
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
### Configure virtualbox
|
### Configure virtualbox
|
||||||
|
|
||||||
1. Open virtualbox and navigate to its preferences/settings window.
|
1. Open virtualbox and navigate to its preferences/settings window.
|
||||||
|
|||||||
@ -0,0 +1,18 @@
|
|||||||
|
<!--
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
or more contributor license agreements. See the NOTICE file
|
||||||
|
distributed with this work for additional information
|
||||||
|
regarding copyright ownership. The ASF licenses this file
|
||||||
|
to you under the Apache License, Version 2.0 (the
|
||||||
|
"License"); you may not use this file except in compliance
|
||||||
|
with the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing,
|
||||||
|
software distributed under the License is distributed on an
|
||||||
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
KIND, either express or implied. See the License for the
|
||||||
|
specific language governing permissions and limitations
|
||||||
|
under the License.
|
||||||
|
-->
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
<!--
|
||||||
|
Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
or more contributor license agreements. See the NOTICE file
|
||||||
|
distributed with this work for additional information
|
||||||
|
regarding copyright ownership. The ASF licenses this file
|
||||||
|
to you under the Apache License, Version 2.0 (the
|
||||||
|
"License"); you may not use this file except in compliance
|
||||||
|
with the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing,
|
||||||
|
software distributed under the License is distributed on an
|
||||||
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
KIND, either express or implied. See the License for the
|
||||||
|
specific language governing permissions and limitations
|
||||||
|
under the License.
|
||||||
|
-->
|
||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# Docker Files for Apache CloudStack
|
# Docker Files for Apache CloudStack
|
||||||
|
|
||||||
Dockerfiles used to build CloudStack images are available on Docker hub.
|
Dockerfiles used to build CloudStack images are available on Docker hub.
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 152 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
19
ui/README.md
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# CloudStack UI
|
# CloudStack UI
|
||||||
|
|
||||||
A modern role-based progressive CloudStack UI based on Vue.js and Ant Design.
|
A modern role-based progressive CloudStack UI based on Vue.js and Ant Design.
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# UI customization
|
# UI customization
|
||||||
Use a `public/config.json` (or `dist/config.json` after build) file for customizing theme, logos,...
|
Use a `public/config.json` (or `dist/config.json` after build) file for customizing theme, logos,...
|
||||||
|
|
||||||
|
|||||||
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# UI Development
|
# UI Development
|
||||||
|
|
||||||
The modern CloudStack UI is role-based progressive app that uses Vue.js and Ant Design.
|
The modern CloudStack UI is role-based progressive app that uses Vue.js and Ant Design.
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 369 KiB After Width: | Height: | Size: 201 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 27 KiB |
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 11 KiB |
@ -1,3 +1,22 @@
|
|||||||
|
<!--
|
||||||
|
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.
|
||||||
|
-->
|
||||||
|
|
||||||
# index.less
|
# index.less
|
||||||
- src/styles/index.less imports all necessary rules for cloudstack
|
- src/styles/index.less imports all necessary rules for cloudstack
|
||||||
|
|
||||||
|
|||||||