Merge branch 'main' into template-restriction

Author: soreana

.python-version

@@ -1 +1 @@
-system
+3.6

.travis.yml

@@ -25,7 +25,7 @@ jdk:
   - openjdk11
 
 python:
-  - "2.7"
+  - "3.9"
 
 node_js:
   - 12
@@ -164,6 +164,7 @@ env:
 
     - TESTS="component/test_project_usage
              component/test_protocol_number_security_group
+             component/test_public_ip
              component/test_resource_limits"
 
     - TESTS="component/test_regions_accounts

CONTRIBUTING.md

@@ -14,14 +14,14 @@ Bug fixes
 It's very important that we can easily track bug fix commits, so their hashes should remain the same in all branches. 
 Therefore, a pull request (PR) that fixes a bug, should be sent against a release branch. 
 This can be either the "current release" or the "previous release", depending on which ones are maintained. 
-Since the goal is a stable master, bug fixes should be "merged forward" to the next branch in order: "previous release" -> "current release" -> master (in other words: old to new)
+Since the goal is a stable main, bug fixes should be "merged forward" to the next branch in order: "previous release" -> "current release" -> main (in other words: old to new)
 
 Developing new features
 -----------------------
 
-Development should be done in a feature branch, branched off of master. 
-Send a PR(steps below) to get it into master (2x LGTM applies). 
-PR will only be merged when master is open, will be held otherwise until master is open again. 
+Development should be done in a feature branch, branched off of main. 
+Send a PR(steps below) to get it into main (2x LGTM applies). 
+PR will only be merged when main is open, will be held otherwise until main is open again. 
 No back porting / cherry-picking features to existing branches!
 
 PendingReleaseNotes file
@@ -46,17 +46,17 @@ On your computer, follow these steps to setup a local repository for working on
 $ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
 $ cd cloudstack
 $ git remote add upstream https://github.com/apache/cloudstack.git
-$ git checkout master
+$ git checkout main
 $ git fetch upstream
-$ git rebase upstream/master
+$ git rebase upstream/main
 ```
 
 
 Making changes
 --------------
 
 
-It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to rebase in changes from `upstream/master`).  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.
+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.
 
 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.
 
@@ -71,26 +71,26 @@ $ git commit -a -m "descriptive commit message for your changes"
 > 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`.
 
 
-Rebase `feature_x` to include updates from `upstream/master`
+Rebase `feature_x` to include updates from `upstream/main`
 ------------------------------------------------------------
 
-It is important that you maintain an up-to-date `master` branch in your local repository.  This is done by rebasing in the code changes from `upstream/master` (the official ACS project repository) into your local repository.  You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request.  I recommend you do this process periodically while you work to make sure you are working off the most recent project code.
+It is important that you maintain an up-to-date `main` branch in your local repository.  This is done by rebasing in the code changes from `upstream/main` (the official ACS project repository) into your local repository.  You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request.  I recommend you do this process periodically while you work to make sure you are working off the most recent project code.
 
 This process will do the following:
 
-1. Checkout your local `master` branch
-2. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the project
+1. Checkout your local `main` branch
+2. Synchronize your local `main` branch with the `upstream/main` so you have all the latest changes from the project
 3. Rebase the latest project code into your `feature_x` branch so it is up-to-date with the upstream code
 
 ``` bash
-$ git checkout master
+$ git checkout main
 $ git fetch upstream
-$ git rebase upstream/master
+$ git rebase upstream/main
 $ git checkout feature_x
-$ git rebase master
+$ git rebase main
 ```
 
-> Now your `feature_x` branch is up-to-date with all the code in `upstream/master`.
+> Now your `feature_x` branch is up-to-date with all the code in `upstream/main`.
 
 
 Make a GitHub Pull Request to contribute your changes
@@ -100,10 +100,10 @@ When you are happy with your changes and you are ready to contribute them, you w
 
 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.
 
-> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/master` _before_ you do this.
+> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/main` _before_ you do this.
 
 ``` bash
-$ git push origin master
+$ git push origin main
 $ git push origin feature_x
 ```
 
@@ -113,7 +113,7 @@ To initiate the pull request, do the following:
 
 1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/cloudstack](https://github.com/YOUR_ACCOUNT/cloudstack)
 2. Click the new button called '**Compare & pull request**' that showed up just above the main area in your forked repository
-3. Validate the pull request will be into the upstream `master` and will be from your `feature_x` branch
+3. Validate the pull request will be into the upstream `main` and will be from your `feature_x` branch
 4. Enter a detailed description of the work you have done and then click '**Send pull request**'
 
 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.
@@ -122,14 +122,14 @@ If you are requested to make modifications to your proposed changes, make the ch
 Cleaning up after a successful pull request
 -------------------------------------------
 
-Once the `feature_x` branch has been committed into the `upstream/master` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed.  If you want to make additional changes, restart the process with a new branch.
+Once the `feature_x` branch has been committed into the `upstream/main` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed.  If you want to make additional changes, restart the process with a new branch.
 
-> **IMPORTANT:** Make sure that your changes are in `upstream/master` before you delete your `feature_x` and `origin/feature_x` branches!
+> **IMPORTANT:** Make sure that your changes are in `upstream/main` before you delete your `feature_x` and `origin/feature_x` branches!
 
 You can delete these deprecated branches with the following:
 
 ``` bash
-$ git checkout master
+$ git checkout main
 $ git branch -D feature_x
 $ git push origin :feature_x
 ```

ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
 Verify first that your issue/request is not already reported on GitHub.
-Also test if the latest release and master branch are affected too.
+Also test if the latest release and main branch are affected too.
 Always add information AFTER of these HTML comments, but no need to delete the comments.
 -->
 
@@ -23,7 +23,7 @@ Categorize the issue, e.g. API, VR, VPN, UI, etc.
 
 ##### CLOUDSTACK VERSION
 <!--
-New line separated list of affected versions, commit ID for issues on master branch.
+New line separated list of affected versions, commit ID for issues on main branch.
 -->
 
 ~~~

PULL_REQUEST_TEMPLATE.md

@@ -48,4 +48,4 @@ This PR...
 <!-- see how your change affects other areas of the code, etc. -->
 
 
-<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document -->
+<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->

README.md

@@ -1,4 +1,4 @@
-# Apache CloudStack [![Build Status](https://travis-ci.org/apache/cloudstack.svg?branch=master)](https://travis-ci.org/apache/cloudstack) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apachecloudstack) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=ncloc)](https://sonarcloud.io/dashboard?id=apachecloudstack) ![GitHub language count](https://img.shields.io/github/languages/count/apache/cloudstack.svg) ![GitHub top language](https://img.shields.io/github/languages/top/apache/cloudstack.svg)
+# Apache CloudStack [![Build Status](https://travis-ci.org/apache/cloudstack.svg?branch=main)](https://travis-ci.org/apache/cloudstack) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=alert_status)](https://sonarcloud.io/dashboard?id=apachecloudstack) [![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=apachecloudstack&metric=ncloc)](https://sonarcloud.io/dashboard?id=apachecloudstack) ![GitHub language count](https://img.shields.io/github/languages/count/apache/cloudstack.svg) ![GitHub top language](https://img.shields.io/github/languages/top/apache/cloudstack.svg)
 
 ![Apache CloudStack](tools/logo/apache_cloudstack.png)
 
@@ -58,7 +58,7 @@ via Github pull requests.
 * Developer [wiki](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Home)
 * [Release notes](http://docs.cloudstack.apache.org/projects/cloudstack-release-notes)
 * Design [documents](https://cwiki.apache.org/confluence/display/CLOUDSTACK/Design)
-* API [documentation](http://cloudstack.apache.org/docs/api)
+* API [documentation](https://cloudstack.apache.org/api.html)
 * How to [contribute](CONTRIBUTING.md)
 
 ## Getting Involved and Contributing
@@ -81,11 +81,7 @@ Mailing lists:
 - [Issues Mailing List](mailto:[email protected])
 - [Marketing Mailing List](mailto:[email protected])
 
-IRC, join us on irc.freenode.net on:
-- `#cloudstack`: General Apache CloudStack conversation and end user support
-- `#cloudstack-dev`: Development discussions
-
-Report and/or check bugs on [JIRA](https://issues.apache.org/jira/browse/CLOUDSTACK) and check our
+Report and/or check bugs on [Github](https://github.com/apache/cloudstack/issues) and check our
 developer [page](http://cloudstack.apache.org/developers.html) for contributing code.
 
 ## News and Events

api/src/main/java/com/cloud/agent/api/Command.java

@@ -37,6 +37,7 @@ public static enum OnError {
     @LogLevel(Log4jLevel.Trace)
     protected Map<String, String> contextMap = new HashMap<String, String>();
     private int wait;  //in second
+    private boolean bypassHostMaintenance = false;
 
     protected Command() {
         this.wait = 0;
@@ -74,6 +75,14 @@ public boolean allowCaching() {
         return true;
     }
 
+    public boolean isBypassHostMaintenance() {
+        return bypassHostMaintenance;
+    }
+
+    public void setBypassHostMaintenance(boolean bypassHostMaintenance) {
+        this.bypassHostMaintenance = bypassHostMaintenance;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

api/src/main/java/com/cloud/event/EventTypes.java

@@ -374,6 +374,7 @@ public class EventTypes {
     // Primary storage pool
     public static final String EVENT_ENABLE_PRIMARY_STORAGE = "ENABLE.PS";
     public static final String EVENT_DISABLE_PRIMARY_STORAGE = "DISABLE.PS";
+    public static final String EVENT_SYNC_STORAGE_POOL = "SYNC.STORAGE.POOL";
 
     // VPN
     public static final String EVENT_REMOTE_ACCESS_VPN_CREATE = "VPN.REMOTE.ACCESS.CREATE";

api/src/main/java/com/cloud/host/Status.java

@@ -131,6 +131,9 @@ public static String[] toStrings(Status... states) {
         s_fsm.addTransition(Status.Up, Event.PingTimeout, Status.Alert);
         s_fsm.addTransition(Status.Up, Event.AgentDisconnected, Status.Alert);
         s_fsm.addTransition(Status.Up, Event.ShutdownRequested, Status.Disconnected);
+        s_fsm.addTransition(Status.Disconnected, Event.ShutdownRequested, Status.Disconnected);
+        s_fsm.addTransition(Status.Down, Event.ShutdownRequested, Status.Disconnected);
+        s_fsm.addTransition(Status.Rebalancing, Event.ShutdownRequested, Status.Disconnected);
         s_fsm.addTransition(Status.Up, Event.HostDown, Status.Down);
         s_fsm.addTransition(Status.Up, Event.Ping, Status.Up);
         s_fsm.addTransition(Status.Up, Event.AgentConnected, Status.Connecting);

api/src/main/java/com/cloud/network/Site2SiteCustomerGateway.java

@@ -43,5 +43,9 @@ public interface Site2SiteCustomerGateway extends ControlledEntity, Identity, In
 
     public Date getRemoved();
 
+    public Boolean getSplitConnections();
+
+    public String getIkeVersion();
+
     String getName();
 }