Skip to content

Commit 376bd4f

Browse files
authored
Merge branch 'main' into PR-Remove-UI-Blockage-on-Change-Volume-Offering
2 parents cd511c0 + 0934fb1 commit 376bd4f

File tree

1,183 files changed

+97858
-77486
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,183 files changed

+97858
-77486
lines changed

.asf.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@ github:
5151

5252
collaborators:
5353
- acs-robot
54-
- rajujith
55-
- GaOrtiga
56-
- SadiJr
57-
- winterhazel
5854
- gpordeus
5955
- hsato03
6056
- bernardodemarco
61-
- abh1sar
6257
- FelipeM525
58+
- lucas-a-martins
59+
- nicoschmdt
60+
- abh1sar
6361

6462
protected_branches: ~
6563

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for reporting a bug!"
18+
name: bug
19+
title: "[SHORT PROBLEM DESCRIPTION]"
20+
labels: bug, needs-triageing
21+
body:
22+
- type: markdown
23+
attributes:
24+
value: "## Welcome, please describe your problem below;"
25+
- type: textarea
26+
attributes:
27+
label: problem
28+
value: The long description of your problem
29+
- type: markdown
30+
attributes:
31+
value: "## What versions of cloudstack and any infra components are you using"
32+
- type: textarea
33+
attributes:
34+
label: versions
35+
value: The versions of ACS, hypervisors, storage, network etc..
36+
- type: textarea
37+
attributes:
38+
label: The steps to reproduce the bug
39+
value: |
40+
1.
41+
2.
42+
3.
43+
...
44+
- type: textarea
45+
attributes:
46+
label: "What to do about it?"
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
description: "Thank you for your new feature idea!"
18+
name: feature
19+
title: "[SHORT FUNCTIONAL DESCRIPTION]"
20+
labels: new
21+
body:
22+
- type: textarea
23+
attributes:
24+
label: "The required feature described as a wish"
25+
value: As a User/Admin/Operator I would like to , ... have the system make my morning coffee.

.github/linters/.markdown-lint.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,15 @@ MD004: false
2727
# MD007/ul-indent Unordered list indentation
2828
MD007: false
2929

30-
# MD009/no-trailing-spaces Trailing spaces
31-
MD009: false
32-
3330
# MD010/no-hard-tabs Hard tabs
3431
MD010: false
3532

36-
# MD012/no-multiple-blanks Multiple consecutive blank lines
37-
MD012: false
38-
3933
# MD013/line-length Line length
4034
MD013: false
4135

4236
# MD014/commands-show-output Dollar signs used before commands without showing output
4337
MD014: false
4438

45-
# MD018/no-missing-space-atx No space after hash on atx style heading
46-
MD018: false
47-
48-
# MD019/no-multiple-space-atx Multiple spaces after hash on atx style heading
49-
MD019: false
50-
5139
# MD022/blanks-around-headings Headings should be surrounded by blank lines
5240
MD022: false
5341

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

.pre-commit-config.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ repos:
5454
^systemvm/agent/certs/realhostip\.key$
5555
- id: end-of-file-fixer
5656
exclude: \.vhd$
57-
#- id: fix-byte-order-marker
57+
- id: fix-byte-order-marker
5858
- id: forbid-submodules
5959
- id: mixed-line-ending
60-
exclude: \.(cs|xml)$
60+
exclude: \.cs$
6161
- id: trailing-whitespace
62-
files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
62+
files: \.(bat|cfg|cs|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
6363
args: [--markdown-linebreak-ext=md]
6464
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
6565
- repo: https://github.com/codespell-project/codespell
@@ -87,7 +87,7 @@ repos:
8787
^setup/bindir/cloud-setup-encryption\.in$|
8888
^venv/.*$
8989
- repo: https://github.com/igorshubovych/markdownlint-cli
90-
rev: v0.40.0
90+
rev: v0.43.0
9191
hooks:
9292
- id: markdownlint
9393
name: run markdownlint

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.6
1+
3.10

CHANGES.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ Bug ID | Description
242242
[CLOUDSTACK-7722](https://issues.apache.org/jira/browse/CLOUDSTACK-7722) | add.label: Add button for tags show the label not "Add" text...
243243
[CLOUDSTACK-7246](https://issues.apache.org/jira/browse/CLOUDSTACK-7246) | VM deployment failed due to wrong in script name createipalias.sh...
244244

245-
246245
Version 4.4.1
247246
-------------
248247

@@ -276,7 +275,6 @@ Bug ID | Description
276275
[CLOUDSTACK-1632](https://issues.apache.org/jira/browse/CLOUDSTACK-1632) | Mistakes in authorizeSecurityGroup* API docs...
277276
[CLOUDSTACK-401](https://issues.apache.org/jira/browse/CLOUDSTACK-401) | Storage options missing from table...
278277

279-
280278
Version 4.4.0
281279
-------------
282280

@@ -930,7 +928,6 @@ Security Fixes:
930928

931929
* CVE-2012-4501: Apache CloudStack configuration vulnerability
932930

933-
934931
Version 4.0.2
935932
------------------------
936933

@@ -979,7 +976,6 @@ Issues fixed in this release:
979976
* CLOUDSTACK-2090: Upgrade from version 4.0.1 to version 4.0.2 triggers the 4.0.0 to 4.0.1.
980977
* CLOUDSTACK-2091: Error in API documentation for 4.0.x.
981978

982-
983979
Version 4.0.1-incubating
984980
------------------------
985981

@@ -1023,7 +1019,6 @@ Bugs fixed in this release:
10231019
* CLOUDSTACK-961: Installation docs don't detail dependencies for building RPMs
10241020
* CLOUDSTACK-995: Not able to add the KVM host
10251021

1026-
10271022
Version 4.0.0-incubating
10281023
------------------------
10291024

@@ -1056,7 +1051,6 @@ Security Fixes:
10561051

10571052
* CVE-2012-4501: Apache CloudStack configuration vulnerability
10581053

1059-
10601054
Updating this file
10611055
------------------
10621056

CONTRIBUTING.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Contributing to Apache CloudStack (ACS)
44
Summary
55
-------
66
This document covers how to contribute to the ACS project. ACS uses GitHub PRs to manage code contributions.
7-
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project and you will submit a Pull Request for your changes to be added.
7+
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project, and you will submit a Pull Request for your changes to be added.
88

9-
_Lets get started!!!_
9+
_Let's get started!!!_
1010

1111
Bug fixes
1212
---------
@@ -26,7 +26,7 @@ No back porting / cherry-picking features to existing branches!
2626

2727
PendingReleaseNotes file
2828
------------------------
29-
When developing a new feature or making a (major) change to a existing feature you are encouraged to append this to the PendingReleaseNotes file so that the Release Manager can
29+
When developing a new feature or making a (major) change to an existing feature you are encouraged to append this to the PendingReleaseNotes file so that the Release Manager can
3030
use this file as a source of information when compiling the Release Notes for a new release.
3131

3232
When adding information to the PendingReleaseNotes file make sure that you write a good and understandable description of the new feature or change which you have developed.
@@ -38,9 +38,9 @@ Fork the code
3838

3939
In your browser, navigate to: [https://github.com/apache/cloudstack](https://github.com/apache/cloudstack)
4040

41-
Fork the repository by clicking on the 'Fork' button on the top right hand side. The fork will happen and you will be taken to your own fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '**HTTPS** clone URL'. You will paste this URL when doing the following `git clone` command.
41+
Fork the repository by clicking on the 'Fork' button on the top right hand side. The fork will happen, and you will be taken to your own fork of the repository. Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '**HTTPS** clone URL'. You will paste this URL when doing the following `git clone` command.
4242

43-
On your computer, follow these steps to setup a local repository for working on ACS:
43+
On your computer, follow these steps to set up a local repository for working on ACS:
4444

4545
```bash
4646
$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
@@ -51,11 +51,9 @@ $ git fetch upstream
5151
$ git rebase upstream/main
5252
```
5353

54-
5554
Making changes
5655
--------------
5756

58-
5957
It is important that you create a new branch to make changes on and that you do not change the `main` branch (other than to rebase in changes from `upstream/main`). In this example I will assume you will be making your changes to a branch called `feature_x`. This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the ACS project.
6058

6159
It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch.
@@ -70,7 +68,6 @@ $ git commit -a -m "descriptive commit message for your changes"
7068

7169
> The `-b` specifies that you want to create a new branch called `feature_x`. You only specify `-b` the first time you checkout because you are creating a new branch. Once the `feature_x` branch exists, you can later switch to it with only `git checkout feature_x`.
7270
73-
7471
Rebase `feature_x` to include updates from `upstream/main`
7572
------------------------------------------------------------
7673

@@ -92,13 +89,12 @@ $ git rebase main
9289

9390
> Now your `feature_x` branch is up-to-date with all the code in `upstream/main`.
9491
95-
9692
Make a GitHub Pull Request to contribute your changes
9793
-----------------------------------------------------
9894

99-
When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so. This is done by pushing your local changes to your forked repository (default remote name is `origin`) and then initiating a pull request on GitHub.
95+
When you are happy with your changes, and you are ready to contribute them, you will create a Pull Request on GitHub to do so. This is done by pushing your local changes to your forked repository (default remote name is `origin`) and then initiating a pull request on GitHub.
10096

101-
Please include JIRA id, detailed information about the bug/feature, what all tests are executed, how the reviewer can test this feature etc. Incase of UI PRs, a screenshot is preferred.
97+
Please include JIRA id, detailed information about the bug/feature, what all tests are executed, how the reviewer can test this feature etc. In case of UI PRs, a screenshot is preferred.
10298

10399
> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/main` _before_ you do this.
104100
@@ -107,7 +103,7 @@ $ git push origin main
107103
$ git push origin feature_x
108104
```
109105

110-
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.
106+
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.
111107

112108
To initiate the pull request, do the following:
113109

@@ -118,7 +114,6 @@ To initiate the pull request, do the following:
118114

119115
If you are requested to make modifications to your proposed changes, make the changes locally on your `feature_x` branch, re-push the `feature_x` branch to your fork. The existing pull request should automatically pick up the change and update accordingly.
120116

121-
122117
Cleaning up after a successful pull request
123118
-------------------------------------------
124119

INSTALL.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ Setup up NodeJS (LTS):
3737
Start the MySQL service:
3838

3939
$ service mysqld start
40+
$ mysql_secure_installation
4041

4142
### Using jenv and/or pyenv for Version Management
4243

@@ -86,13 +87,33 @@ Start the management server:
8687

8788
If this works, you've successfully setup a single server Apache CloudStack installation.
8889

89-
Open the following URL on your browser to access the Management Server UI:
90-
91-
http://localhost:8080/client/
90+
To access the Management Server UI, follow the following procedure:
9291

9392
The default credentials are; user: admin, password: password and the domain
9493
field should be left blank which is defaulted to the ROOT domain.
9594

95+
## To bring up CloudStack UI
96+
97+
Move to UI Directory
98+
99+
$ cd /path/to/cloudstack/ui
100+
101+
To install dependencies.
102+
103+
$ npm install
104+
105+
To build the project.
106+
107+
$ npm build
108+
109+
For Development Mode.
110+
111+
$ npm start
112+
113+
Make sure to set CS_URL=http://localhost:8080/client on .env.local file on ui.
114+
115+
You should be able to run the management server on http://localhost:5050
116+
96117
## Building with non-redistributable plugins
97118

98119
CloudStack supports several plugins that depend on libraries with distribution restrictions.

0 commit comments

Comments
 (0)