You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/05/25 09:22:38 UTC

[1/4] git commit: updated refs/heads/4.7.1.1-RC20160525T1230 to 781775a

Repository: cloudstack
Updated Branches:
  refs/heads/4.7.1.1-RC20160525T1230 [created] 781775a31


CLOUDSTACK-9376: Restrict listTemplates API with filter=all for root admin

Restricts use of listemplates API with templatefilter=all for root admin only.

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e6af340e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e6af340e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e6af340e

Branch: refs/heads/4.7.1.1-RC20160525T1230
Commit: e6af340ef762705bf3a87f608a412077c8272a9f
Parents: 5ea07dc
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed May 25 11:52:58 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 25 12:20:46 2016 +0530

----------------------------------------------------------------------
 .../com/cloud/api/query/QueryManagerImpl.java   |  4 +-
 test/integration/component/test_templates.py    | 76 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6af340e/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index a87d9fb..99f210f 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -3054,9 +3054,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService, Confi
 
         boolean listAll = false;
         if (templateFilter != null && templateFilter == TemplateFilter.all) {
-            if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
+            if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) {
                 throw new InvalidParameterValueException("Filter " + TemplateFilter.all
-                        + " can be specified by admin only");
+                        + " can be specified by root admin only");
             }
             listAll = true;
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e6af340e/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index b1e7e7c..c8384d9 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -22,6 +22,7 @@ from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import listZones
 from marvin.lib.utils import (cleanup_resources)
 from marvin.lib.base import (Account,
+                             Domain,
                              Template,
                              ServiceOffering,
                              VirtualMachine,
@@ -51,6 +52,7 @@ class Services:
                 # username
                 "password": "password",
             },
+            "testdomain": {"name": "test"},
             "service_offering": {
                 "name": "Tiny Instance",
                 "displaytext": "Tiny Instance",
@@ -602,3 +604,77 @@ class TestTemplates(cloudstackTestCase):
             "Check the state of VM created from Template"
         )
         return
+
+
+class TestListTemplate(cloudstackTestCase):
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.hypervisor = self.testClient.getHypervisorInfo()
+        self.dbclient = self.testClient.getDbConnection()
+        self.cleanup = []
+
+        self.services = Services().services
+        # Get Zone, Domain and templates
+        self.domain = get_domain(self.apiclient)
+        self.account = Account.create(
+                            self.apiclient,
+                            self.services["account"],
+                            domainid=self.domain.id
+                            )
+        self.newdomain = Domain.create(
+                           self.apiclient,
+                           self.services["testdomain"],
+                           parentdomainid=self.domain.id
+                           )
+        self.newdomain_account = Account.create(
+                           self.apiclient,
+                           self.services["account"],
+                           admin=True,
+                           domainid=self.newdomain.id
+                           )
+        self.cleanup = [
+                        self.account,
+                        self.newdomain_account,
+                        self.newdomain,
+                        ]
+
+
+    def tearDown(self):
+        try:
+            # Clean up, terminate the created templates
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_01_list_templates_with_templatefilter_all_normal_user(self):
+        """
+            Test list templates with templatefilter=all is not permitted for normal user
+        """
+
+        user_api_client = self.testClient.getUserApiClient(
+                                    UserName=self.account.name,
+                                    DomainName=self.account.domain)
+        try:
+            list_template_response = Template.list(self.user_api_client, templatefilter='all')
+            self.fail("Regular User is able to use templatefilter='all' in listTemplates API call")
+        except Exception as e:
+            self.debug("ListTemplates API with templatefilter='all' is not permitted for normal user")
+
+
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_02_list_templates_with_templatefilter_all_domain_admin(self):
+        """
+            Test list templates with templatefilter=all is not permitted for domain admin
+        """
+
+        domain_user_api_client = self.testClient.getUserApiClient(
+                                    UserName=self.newdomain_account.name,
+                                    DomainName=self.newdomain_account.domain)
+        try:
+            list_template_response = Template.list(self.domain_user_api_client, templatefilter='all')
+            self.fail("Domain admin is able to use templatefilter='all' in listTemplates API call")
+        except Exception as e:
+            self.debug("ListTemplates API with templatefilter='all' is not permitted for domain admin user")


[4/4] git commit: updated refs/heads/4.7.1.1-RC20160525T1230 to 781775a

Posted by bh...@apache.org.
Updating pom.xml version numbers for release 4.7.1.1

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/781775a3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/781775a3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/781775a3

Branch: refs/heads/4.7.1.1-RC20160525T1230
Commit: 781775a31f6c0f080777743cb6f73494628e71fb
Parents: e29d871
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed May 25 12:30:56 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 25 12:30:56 2016 +0530

----------------------------------------------------------------------
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/781775a3/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 1f12319..3a38a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloudstack (4.7.1.1) unstable; urgency=low
+
+  * Update the version to 4.7.1.1
+
+ -- the Apache CloudStack project <de...@cloudstack.apache.org>  Wed, 25 May 2016 12:30:56 +0530
+
 cloudstack (4.7.1) unstable; urgency=low
 
   * Update the version to 4.7.1


[3/4] git commit: updated refs/heads/4.7.1.1-RC20160525T1230 to 781775a

Posted by bh...@apache.org.
Updating pom.xml version numbers for release 4.7.1.1

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e29d871b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e29d871b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e29d871b

Branch: refs/heads/4.7.1.1-RC20160525T1230
Commit: e29d871ba2b35332a3779ad1a9e416ecc8bf8bf9
Parents: c7619fa
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed May 25 12:29:52 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 25 12:30:33 2016 +0530

----------------------------------------------------------------------
 agent/pom.xml                                                 | 2 +-
 api/pom.xml                                                   | 2 +-
 client/pom.xml                                                | 2 +-
 core/pom.xml                                                  | 2 +-
 developer/pom.xml                                             | 2 +-
 engine/api/pom.xml                                            | 2 +-
 engine/components-api/pom.xml                                 | 2 +-
 engine/network/pom.xml                                        | 2 +-
 engine/orchestration/pom.xml                                  | 2 +-
 engine/pom.xml                                                | 2 +-
 engine/schema/pom.xml                                         | 2 +-
 engine/service/pom.xml                                        | 2 +-
 engine/storage/cache/pom.xml                                  | 2 +-
 engine/storage/datamotion/pom.xml                             | 2 +-
 engine/storage/image/pom.xml                                  | 2 +-
 engine/storage/integration-test/pom.xml                       | 2 +-
 engine/storage/pom.xml                                        | 2 +-
 engine/storage/snapshot/pom.xml                               | 2 +-
 engine/storage/volume/pom.xml                                 | 2 +-
 framework/cluster/pom.xml                                     | 2 +-
 framework/config/pom.xml                                      | 2 +-
 framework/db/pom.xml                                          | 2 +-
 framework/events/pom.xml                                      | 2 +-
 framework/ipc/pom.xml                                         | 2 +-
 framework/jobs/pom.xml                                        | 2 +-
 framework/managed-context/pom.xml                             | 2 +-
 framework/pom.xml                                             | 2 +-
 framework/quota/pom.xml                                       | 2 +-
 framework/rest/pom.xml                                        | 2 +-
 framework/security/pom.xml                                    | 2 +-
 framework/spring/lifecycle/pom.xml                            | 2 +-
 framework/spring/module/pom.xml                               | 2 +-
 maven-standard/pom.xml                                        | 2 +-
 plugins/acl/static-role-based/pom.xml                         | 2 +-
 plugins/affinity-group-processors/explicit-dedication/pom.xml | 2 +-
 plugins/affinity-group-processors/host-anti-affinity/pom.xml  | 2 +-
 plugins/alert-handlers/snmp-alerts/pom.xml                    | 2 +-
 plugins/alert-handlers/syslog-alerts/pom.xml                  | 2 +-
 plugins/api/discovery/pom.xml                                 | 2 +-
 plugins/api/rate-limit/pom.xml                                | 2 +-
 plugins/api/solidfire-intg-test/pom.xml                       | 2 +-
 plugins/database/mysql-ha/pom.xml                             | 2 +-
 plugins/database/quota/pom.xml                                | 2 +-
 plugins/dedicated-resources/pom.xml                           | 2 +-
 plugins/deployment-planners/implicit-dedication/pom.xml       | 2 +-
 plugins/deployment-planners/user-concentrated-pod/pom.xml     | 2 +-
 plugins/deployment-planners/user-dispersing/pom.xml           | 2 +-
 plugins/event-bus/inmemory/pom.xml                            | 2 +-
 plugins/event-bus/kafka/pom.xml                               | 2 +-
 plugins/event-bus/rabbitmq/pom.xml                            | 2 +-
 plugins/file-systems/netapp/pom.xml                           | 2 +-
 plugins/ha-planners/skip-heurestics/pom.xml                   | 2 +-
 plugins/host-allocators/random/pom.xml                        | 2 +-
 plugins/hypervisors/baremetal/pom.xml                         | 2 +-
 plugins/hypervisors/hyperv/pom.xml                            | 2 +-
 plugins/hypervisors/kvm/pom.xml                               | 2 +-
 plugins/hypervisors/ovm/pom.xml                               | 2 +-
 plugins/hypervisors/ovm3/pom.xml                              | 2 +-
 plugins/hypervisors/simulator/pom.xml                         | 2 +-
 plugins/hypervisors/ucs/pom.xml                               | 2 +-
 plugins/hypervisors/vmware/pom.xml                            | 2 +-
 plugins/hypervisors/xenserver/pom.xml                         | 2 +-
 plugins/network-elements/bigswitch/pom.xml                    | 2 +-
 plugins/network-elements/brocade-vcs/pom.xml                  | 2 +-
 plugins/network-elements/cisco-vnmc/pom.xml                   | 2 +-
 plugins/network-elements/dns-notifier/pom.xml                 | 2 +-
 plugins/network-elements/elastic-loadbalancer/pom.xml         | 2 +-
 plugins/network-elements/f5/pom.xml                           | 2 +-
 plugins/network-elements/globodns/pom.xml                     | 2 +-
 plugins/network-elements/internal-loadbalancer/pom.xml        | 2 +-
 plugins/network-elements/juniper-contrail/pom.xml             | 2 +-
 plugins/network-elements/juniper-srx/pom.xml                  | 2 +-
 plugins/network-elements/midonet/pom.xml                      | 2 +-
 plugins/network-elements/netscaler/pom.xml                    | 2 +-
 plugins/network-elements/nicira-nvp/pom.xml                   | 4 ++--
 plugins/network-elements/nuage-vsp/pom.xml                    | 2 +-
 plugins/network-elements/opendaylight/pom.xml                 | 2 +-
 plugins/network-elements/ovs/pom.xml                          | 2 +-
 plugins/network-elements/palo-alto/pom.xml                    | 2 +-
 plugins/network-elements/stratosphere-ssp/pom.xml             | 2 +-
 plugins/network-elements/vxlan/pom.xml                        | 2 +-
 plugins/pom.xml                                               | 2 +-
 plugins/storage-allocators/random/pom.xml                     | 2 +-
 plugins/storage/image/default/pom.xml                         | 2 +-
 plugins/storage/image/s3/pom.xml                              | 2 +-
 plugins/storage/image/sample/pom.xml                          | 2 +-
 plugins/storage/image/swift/pom.xml                           | 2 +-
 plugins/storage/volume/cloudbyte/pom.xml                      | 2 +-
 plugins/storage/volume/default/pom.xml                        | 2 +-
 plugins/storage/volume/nexenta/pom.xml                        | 2 +-
 plugins/storage/volume/sample/pom.xml                         | 2 +-
 plugins/storage/volume/solidfire/pom.xml                      | 2 +-
 plugins/user-authenticators/ldap/pom.xml                      | 2 +-
 plugins/user-authenticators/md5/pom.xml                       | 2 +-
 plugins/user-authenticators/pbkdf2/pom.xml                    | 2 +-
 plugins/user-authenticators/plain-text/pom.xml                | 2 +-
 plugins/user-authenticators/saml2/pom.xml                     | 2 +-
 plugins/user-authenticators/sha256salted/pom.xml              | 2 +-
 pom.xml                                                       | 2 +-
 quickcloud/pom.xml                                            | 2 +-
 server/pom.xml                                                | 2 +-
 services/console-proxy-rdp/rdpconsole/pom.xml                 | 2 +-
 services/console-proxy/pom.xml                                | 2 +-
 services/console-proxy/server/pom.xml                         | 2 +-
 services/pom.xml                                              | 2 +-
 services/secondary-storage/controller/pom.xml                 | 2 +-
 services/secondary-storage/pom.xml                            | 2 +-
 services/secondary-storage/server/pom.xml                     | 2 +-
 systemvm/pom.xml                                              | 2 +-
 test/pom.xml                                                  | 2 +-
 tools/apidoc/pom.xml                                          | 2 +-
 tools/checkstyle/pom.xml                                      | 2 +-
 tools/devcloud-kvm/pom.xml                                    | 2 +-
 tools/devcloud/pom.xml                                        | 2 +-
 tools/devcloud4/pom.xml                                       | 2 +-
 tools/marvin/pom.xml                                          | 2 +-
 tools/pom.xml                                                 | 2 +-
 tools/wix-cloudstack-maven-plugin/pom.xml                     | 2 +-
 usage/pom.xml                                                 | 2 +-
 utils/pom.xml                                                 | 2 +-
 vmware-base/pom.xml                                           | 2 +-
 121 files changed, 122 insertions(+), 122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/agent/pom.xml
----------------------------------------------------------------------
diff --git a/agent/pom.xml b/agent/pom.xml
index 2d4c0a1..7f6b093 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 401f628..8b9f773 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index d5021ac..fdb58d8 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index a05bf60..dd03aa9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/developer/pom.xml
----------------------------------------------------------------------
diff --git a/developer/pom.xml b/developer/pom.xml
index 603a95f..2ec83b7 100644
--- a/developer/pom.xml
+++ b/developer/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 835675b..76235d5 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/components-api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/components-api/pom.xml b/engine/components-api/pom.xml
index 4776b50..88e9f49 100644
--- a/engine/components-api/pom.xml
+++ b/engine/components-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/network/pom.xml
----------------------------------------------------------------------
diff --git a/engine/network/pom.xml b/engine/network/pom.xml
index 517178c..f4764d6 100644
--- a/engine/network/pom.xml
+++ b/engine/network/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/orchestration/pom.xml
----------------------------------------------------------------------
diff --git a/engine/orchestration/pom.xml b/engine/orchestration/pom.xml
index 2ab5409..5f77894 100755
--- a/engine/orchestration/pom.xml
+++ b/engine/orchestration/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index b9c9980..c5bb6ac 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/schema/pom.xml
----------------------------------------------------------------------
diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml
index 0607dbf..063e298 100644
--- a/engine/schema/pom.xml
+++ b/engine/schema/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index 9b205d3..45890f6 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <artifactId>cloud-engine-service</artifactId>
   <packaging>war</packaging>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/cache/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/cache/pom.xml b/engine/storage/cache/pom.xml
index d475fea..942d82b 100644
--- a/engine/storage/cache/pom.xml
+++ b/engine/storage/cache/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/datamotion/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/datamotion/pom.xml b/engine/storage/datamotion/pom.xml
index 250cba5..5ba366f 100644
--- a/engine/storage/datamotion/pom.xml
+++ b/engine/storage/datamotion/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/image/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/image/pom.xml b/engine/storage/image/pom.xml
index 60e6ecc..109c930 100644
--- a/engine/storage/image/pom.xml
+++ b/engine/storage/image/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/integration-test/pom.xml b/engine/storage/integration-test/pom.xml
index c19864f..0bb02ce 100644
--- a/engine/storage/integration-test/pom.xml
+++ b/engine/storage/integration-test/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/pom.xml b/engine/storage/pom.xml
index c875a0f..fe1349e 100644
--- a/engine/storage/pom.xml
+++ b/engine/storage/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/snapshot/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/pom.xml b/engine/storage/snapshot/pom.xml
index a43fd5f..8f6e8fc 100644
--- a/engine/storage/snapshot/pom.xml
+++ b/engine/storage/snapshot/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/engine/storage/volume/pom.xml
----------------------------------------------------------------------
diff --git a/engine/storage/volume/pom.xml b/engine/storage/volume/pom.xml
index f5433b5..9491b1b 100644
--- a/engine/storage/volume/pom.xml
+++ b/engine/storage/volume/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-engine</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/cluster/pom.xml
----------------------------------------------------------------------
diff --git a/framework/cluster/pom.xml b/framework/cluster/pom.xml
index ea0cb3e..95562e9 100644
--- a/framework/cluster/pom.xml
+++ b/framework/cluster/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/config/pom.xml
----------------------------------------------------------------------
diff --git a/framework/config/pom.xml b/framework/config/pom.xml
index f7ab469..efc6c04 100644
--- a/framework/config/pom.xml
+++ b/framework/config/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/db/pom.xml
----------------------------------------------------------------------
diff --git a/framework/db/pom.xml b/framework/db/pom.xml
index d9f84f1..3d2c46f 100644
--- a/framework/db/pom.xml
+++ b/framework/db/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/events/pom.xml
----------------------------------------------------------------------
diff --git a/framework/events/pom.xml b/framework/events/pom.xml
index 881c42b..2cf79da 100644
--- a/framework/events/pom.xml
+++ b/framework/events/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/ipc/pom.xml
----------------------------------------------------------------------
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index 0fd53aa..999e9bd 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/jobs/pom.xml
----------------------------------------------------------------------
diff --git a/framework/jobs/pom.xml b/framework/jobs/pom.xml
index 5314ac2..0d2b4a0 100644
--- a/framework/jobs/pom.xml
+++ b/framework/jobs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>  
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/managed-context/pom.xml
----------------------------------------------------------------------
diff --git a/framework/managed-context/pom.xml b/framework/managed-context/pom.xml
index e6e49e1..7069512 100644
--- a/framework/managed-context/pom.xml
+++ b/framework/managed-context/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-maven-standard</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../maven-standard/pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/pom.xml
----------------------------------------------------------------------
diff --git a/framework/pom.xml b/framework/pom.xml
index a705664..9648ba5 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <build>
     <defaultGoal>install</defaultGoal>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/quota/pom.xml
----------------------------------------------------------------------
diff --git a/framework/quota/pom.xml b/framework/quota/pom.xml
index 21e836b..5b7476d 100644
--- a/framework/quota/pom.xml
+++ b/framework/quota/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 405493f..7144c7a 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cloud-framework-rest</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/security/pom.xml
----------------------------------------------------------------------
diff --git a/framework/security/pom.xml b/framework/security/pom.xml
index aecc545..27a48d2 100644
--- a/framework/security/pom.xml
+++ b/framework/security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-framework</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/spring/lifecycle/pom.xml
----------------------------------------------------------------------
diff --git a/framework/spring/lifecycle/pom.xml b/framework/spring/lifecycle/pom.xml
index d0cad72..1c12a18 100644
--- a/framework/spring/lifecycle/pom.xml
+++ b/framework/spring/lifecycle/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-maven-standard</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
         <relativePath>../../../maven-standard/pom.xml</relativePath>
     </parent>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/framework/spring/module/pom.xml
----------------------------------------------------------------------
diff --git a/framework/spring/module/pom.xml b/framework/spring/module/pom.xml
index 61fdab2..ff5e8b8 100644
--- a/framework/spring/module/pom.xml
+++ b/framework/spring/module/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-maven-standard</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
         <relativePath>../../../maven-standard/pom.xml</relativePath>
     </parent>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/maven-standard/pom.xml
----------------------------------------------------------------------
diff --git a/maven-standard/pom.xml b/maven-standard/pom.xml
index b124af6..faaa267 100644
--- a/maven-standard/pom.xml
+++ b/maven-standard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/acl/static-role-based/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/acl/static-role-based/pom.xml b/plugins/acl/static-role-based/pom.xml
index da77fa0..3221eeb 100644
--- a/plugins/acl/static-role-based/pom.xml
+++ b/plugins/acl/static-role-based/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/affinity-group-processors/explicit-dedication/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/affinity-group-processors/explicit-dedication/pom.xml b/plugins/affinity-group-processors/explicit-dedication/pom.xml
index 1f4499f..3dc31c6 100644
--- a/plugins/affinity-group-processors/explicit-dedication/pom.xml
+++ b/plugins/affinity-group-processors/explicit-dedication/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
index 584b40b..2ce753a 100644
--- a/plugins/affinity-group-processors/host-anti-affinity/pom.xml
+++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/alert-handlers/snmp-alerts/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/alert-handlers/snmp-alerts/pom.xml b/plugins/alert-handlers/snmp-alerts/pom.xml
index 162f81f..c0359b7 100644
--- a/plugins/alert-handlers/snmp-alerts/pom.xml
+++ b/plugins/alert-handlers/snmp-alerts/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>cloudstack-plugins</artifactId>
     <groupId>org.apache.cloudstack</groupId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/alert-handlers/syslog-alerts/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/alert-handlers/syslog-alerts/pom.xml b/plugins/alert-handlers/syslog-alerts/pom.xml
index f8f7dcf..354dfdb 100644
--- a/plugins/alert-handlers/syslog-alerts/pom.xml
+++ b/plugins/alert-handlers/syslog-alerts/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>cloudstack-plugins</artifactId>
     <groupId>org.apache.cloudstack</groupId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/api/discovery/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml
index be7faaf..e89b098 100644
--- a/plugins/api/discovery/pom.xml
+++ b/plugins/api/discovery/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/api/rate-limit/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml
index 0691492..c19e0cb 100644
--- a/plugins/api/rate-limit/pom.xml
+++ b/plugins/api/rate-limit/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/api/solidfire-intg-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml
index c21764c..d4735fb 100644
--- a/plugins/api/solidfire-intg-test/pom.xml
+++ b/plugins/api/solidfire-intg-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/database/mysql-ha/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/database/mysql-ha/pom.xml b/plugins/database/mysql-ha/pom.xml
index b92c26c..797fcbd 100644
--- a/plugins/database/mysql-ha/pom.xml
+++ b/plugins/database/mysql-ha/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/database/quota/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/database/quota/pom.xml b/plugins/database/quota/pom.xml
index b9f3aa2..78f3892 100644
--- a/plugins/database/quota/pom.xml
+++ b/plugins/database/quota/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/dedicated-resources/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/dedicated-resources/pom.xml b/plugins/dedicated-resources/pom.xml
index dd8bbf4..b00b576 100644
--- a/plugins/dedicated-resources/pom.xml
+++ b/plugins/dedicated-resources/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/deployment-planners/implicit-dedication/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/implicit-dedication/pom.xml b/plugins/deployment-planners/implicit-dedication/pom.xml
index 807c09f..b85e2f2 100644
--- a/plugins/deployment-planners/implicit-dedication/pom.xml
+++ b/plugins/deployment-planners/implicit-dedication/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/deployment-planners/user-concentrated-pod/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-concentrated-pod/pom.xml b/plugins/deployment-planners/user-concentrated-pod/pom.xml
index a4c1216..3091bc8 100644
--- a/plugins/deployment-planners/user-concentrated-pod/pom.xml
+++ b/plugins/deployment-planners/user-concentrated-pod/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/deployment-planners/user-dispersing/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/deployment-planners/user-dispersing/pom.xml b/plugins/deployment-planners/user-dispersing/pom.xml
index 17142c4..5bc7ed7 100644
--- a/plugins/deployment-planners/user-dispersing/pom.xml
+++ b/plugins/deployment-planners/user-dispersing/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/event-bus/inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/inmemory/pom.xml b/plugins/event-bus/inmemory/pom.xml
index d1f121a..2d7b288 100644
--- a/plugins/event-bus/inmemory/pom.xml
+++ b/plugins/event-bus/inmemory/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index 5872a09..8af1e0f 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index 13b9c11..1a19282 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/file-systems/netapp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/file-systems/netapp/pom.xml b/plugins/file-systems/netapp/pom.xml
index e0f0f31..cf98006 100644
--- a/plugins/file-systems/netapp/pom.xml
+++ b/plugins/file-systems/netapp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/ha-planners/skip-heurestics/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/ha-planners/skip-heurestics/pom.xml b/plugins/ha-planners/skip-heurestics/pom.xml
index d632b30..2c329a8 100644
--- a/plugins/ha-planners/skip-heurestics/pom.xml
+++ b/plugins/ha-planners/skip-heurestics/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/host-allocators/random/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/host-allocators/random/pom.xml b/plugins/host-allocators/random/pom.xml
index 19e6123..3dd9480 100644
--- a/plugins/host-allocators/random/pom.xml
+++ b/plugins/host-allocators/random/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/baremetal/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/pom.xml b/plugins/hypervisors/baremetal/pom.xml
index 5e6c451..b649834 100755
--- a/plugins/hypervisors/baremetal/pom.xml
+++ b/plugins/hypervisors/baremetal/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cloud-plugin-hypervisor-baremetal</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/hyperv/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index 5b59397..e60ce90 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <properties>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 971e210..02bc32d 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/ovm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm/pom.xml b/plugins/hypervisors/ovm/pom.xml
index 04f4b22..b805136 100644
--- a/plugins/hypervisors/ovm/pom.xml
+++ b/plugins/hypervisors/ovm/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 3d53dc2..078dad5 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/simulator/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml
index 0d34339..0204267 100644
--- a/plugins/hypervisors/simulator/pom.xml
+++ b/plugins/hypervisors/simulator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack-plugins</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>cloud-plugin-hypervisor-simulator</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/ucs/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ucs/pom.xml b/plugins/hypervisors/ucs/pom.xml
index dca3cef..e1f52ed 100755
--- a/plugins/hypervisors/ucs/pom.xml
+++ b/plugins/hypervisors/ucs/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cloud-plugin-hypervisor-ucs</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 88afddd..5ae7e2e 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/hypervisors/xenserver/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/pom.xml b/plugins/hypervisors/xenserver/pom.xml
index 39b4d44..7c6856d 100644
--- a/plugins/hypervisors/xenserver/pom.xml
+++ b/plugins/hypervisors/xenserver/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/bigswitch/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/bigswitch/pom.xml b/plugins/network-elements/bigswitch/pom.xml
index 4bec331..467b396 100644
--- a/plugins/network-elements/bigswitch/pom.xml
+++ b/plugins/network-elements/bigswitch/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/brocade-vcs/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/brocade-vcs/pom.xml b/plugins/network-elements/brocade-vcs/pom.xml
index 5483994..ad89dbc 100644
--- a/plugins/network-elements/brocade-vcs/pom.xml
+++ b/plugins/network-elements/brocade-vcs/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.cloudstack</groupId>
 		<artifactId>cloudstack-plugins</artifactId>
-		<version>4.7.1</version>
+		<version>4.7.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/cisco-vnmc/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml
index 5cbb1ce..fa3a735 100644
--- a/plugins/network-elements/cisco-vnmc/pom.xml
+++ b/plugins/network-elements/cisco-vnmc/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/dns-notifier/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/dns-notifier/pom.xml b/plugins/network-elements/dns-notifier/pom.xml
index c0398f3..1e0dbf8 100644
--- a/plugins/network-elements/dns-notifier/pom.xml
+++ b/plugins/network-elements/dns-notifier/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cloud-plugin-example-dns-notifier</artifactId>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/elastic-loadbalancer/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/elastic-loadbalancer/pom.xml b/plugins/network-elements/elastic-loadbalancer/pom.xml
index 983a3dc..b2c14c8 100644
--- a/plugins/network-elements/elastic-loadbalancer/pom.xml
+++ b/plugins/network-elements/elastic-loadbalancer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/f5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/f5/pom.xml b/plugins/network-elements/f5/pom.xml
index 3ea65ee..63991df 100644
--- a/plugins/network-elements/f5/pom.xml
+++ b/plugins/network-elements/f5/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/globodns/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 4f848d3..537e131 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/internal-loadbalancer/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/internal-loadbalancer/pom.xml b/plugins/network-elements/internal-loadbalancer/pom.xml
index df59c2f..26b6ffd 100644
--- a/plugins/network-elements/internal-loadbalancer/pom.xml
+++ b/plugins/network-elements/internal-loadbalancer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/juniper-contrail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index c979152..24486bd 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <repositories>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/juniper-srx/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-srx/pom.xml b/plugins/network-elements/juniper-srx/pom.xml
index 27d9ed4..96b1f01 100644
--- a/plugins/network-elements/juniper-srx/pom.xml
+++ b/plugins/network-elements/juniper-srx/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/midonet/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/midonet/pom.xml b/plugins/network-elements/midonet/pom.xml
index f81e79d..ebce7b0 100644
--- a/plugins/network-elements/midonet/pom.xml
+++ b/plugins/network-elements/midonet/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 <repositories>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/netscaler/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 05eea47..69b10fd 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/nicira-nvp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nicira-nvp/pom.xml b/plugins/network-elements/nicira-nvp/pom.xml
index aeeff0f..026b855 100644
--- a/plugins/network-elements/nicira-nvp/pom.xml
+++ b/plugins/network-elements/nicira-nvp/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-utils</artifactId>
-      <version>4.7.1</version>
+      <version>4.7.1.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/nuage-vsp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/nuage-vsp/pom.xml b/plugins/network-elements/nuage-vsp/pom.xml
index 93e5dfe..1bcde40b 100644
--- a/plugins/network-elements/nuage-vsp/pom.xml
+++ b/plugins/network-elements/nuage-vsp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/opendaylight/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/opendaylight/pom.xml b/plugins/network-elements/opendaylight/pom.xml
index fb5879d..4d48dd7 100644
--- a/plugins/network-elements/opendaylight/pom.xml
+++ b/plugins/network-elements/opendaylight/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/ovs/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/ovs/pom.xml b/plugins/network-elements/ovs/pom.xml
index 44c3d90..ffd7402 100644
--- a/plugins/network-elements/ovs/pom.xml
+++ b/plugins/network-elements/ovs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/palo-alto/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/palo-alto/pom.xml b/plugins/network-elements/palo-alto/pom.xml
index 5396221..85eefe2 100644
--- a/plugins/network-elements/palo-alto/pom.xml
+++ b/plugins/network-elements/palo-alto/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/stratosphere-ssp/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/stratosphere-ssp/pom.xml b/plugins/network-elements/stratosphere-ssp/pom.xml
index c6d8d7b..1133556 100644
--- a/plugins/network-elements/stratosphere-ssp/pom.xml
+++ b/plugins/network-elements/stratosphere-ssp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/network-elements/vxlan/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/vxlan/pom.xml b/plugins/network-elements/vxlan/pom.xml
index 6c202ef..e8ea4f4 100644
--- a/plugins/network-elements/vxlan/pom.xml
+++ b/plugins/network-elements/vxlan/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index cba8a10..a3af462 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
 
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage-allocators/random/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage-allocators/random/pom.xml b/plugins/storage-allocators/random/pom.xml
index a9e07699..acf88c7 100644
--- a/plugins/storage-allocators/random/pom.xml
+++ b/plugins/storage-allocators/random/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/image/default/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/image/default/pom.xml b/plugins/storage/image/default/pom.xml
index a9d3b71..87773d6 100644
--- a/plugins/storage/image/default/pom.xml
+++ b/plugins/storage/image/default/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/image/s3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/image/s3/pom.xml b/plugins/storage/image/s3/pom.xml
index e11d3f7..aa4dc9e 100644
--- a/plugins/storage/image/s3/pom.xml
+++ b/plugins/storage/image/s3/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/image/sample/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/image/sample/pom.xml b/plugins/storage/image/sample/pom.xml
index 8a4ed02..028cb61 100644
--- a/plugins/storage/image/sample/pom.xml
+++ b/plugins/storage/image/sample/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/image/swift/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/image/swift/pom.xml b/plugins/storage/image/swift/pom.xml
index a829452..dff1e99 100644
--- a/plugins/storage/image/swift/pom.xml
+++ b/plugins/storage/image/swift/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index d5d3ccc..1ae5d10 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/volume/default/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/pom.xml b/plugins/storage/volume/default/pom.xml
index 4d860cd..511b53d 100644
--- a/plugins/storage/volume/default/pom.xml
+++ b/plugins/storage/volume/default/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/volume/nexenta/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/nexenta/pom.xml b/plugins/storage/volume/nexenta/pom.xml
index 2eefaad..9ea444c 100644
--- a/plugins/storage/volume/nexenta/pom.xml
+++ b/plugins/storage/volume/nexenta/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/volume/sample/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/sample/pom.xml b/plugins/storage/volume/sample/pom.xml
index 3b35c71..bb32d05 100644
--- a/plugins/storage/volume/sample/pom.xml
+++ b/plugins/storage/volume/sample/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/storage/volume/solidfire/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/solidfire/pom.xml b/plugins/storage/volume/solidfire/pom.xml
index bf2c3fb..39b32c5 100644
--- a/plugins/storage/volume/solidfire/pom.xml
+++ b/plugins/storage/volume/solidfire/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 492396c..69a0f72 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/md5/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/md5/pom.xml b/plugins/user-authenticators/md5/pom.xml
index a6cb93b..ff8c0c8 100644
--- a/plugins/user-authenticators/md5/pom.xml
+++ b/plugins/user-authenticators/md5/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/pbkdf2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/pbkdf2/pom.xml b/plugins/user-authenticators/pbkdf2/pom.xml
index 8a645d4..eda5df1 100644
--- a/plugins/user-authenticators/pbkdf2/pom.xml
+++ b/plugins/user-authenticators/pbkdf2/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/plain-text/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/plain-text/pom.xml b/plugins/user-authenticators/plain-text/pom.xml
index 140f2b7..41ba8a4 100644
--- a/plugins/user-authenticators/plain-text/pom.xml
+++ b/plugins/user-authenticators/plain-text/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index faaca62..f6c7bf4 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/plugins/user-authenticators/sha256salted/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/sha256salted/pom.xml b/plugins/user-authenticators/sha256salted/pom.xml
index c008781..d15c766 100644
--- a/plugins/user-authenticators/sha256salted/pom.xml
+++ b/plugins/user-authenticators/sha256salted/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-plugins</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ed4619..780b1ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.cloudstack</groupId>
   <artifactId>cloudstack</artifactId>
-  <version>4.7.1</version>
+  <version>4.7.1.1</version>
   <packaging>pom</packaging>
   <name>Apache CloudStack</name>
   <description>Apache CloudStack is an IaaS (\u201cInfrastructure as a Service\u201d) cloud orchestration platform.</description>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/quickcloud/pom.xml
----------------------------------------------------------------------
diff --git a/quickcloud/pom.xml b/quickcloud/pom.xml
index 61a8567..24f0229 100644
--- a/quickcloud/pom.xml
+++ b/quickcloud/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-maven-standard</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../maven-standard/pom.xml</relativePath>
   </parent>
 </project>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index b88a13f..7dc9494 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index b4b95af..4852643 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-services</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/console-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/pom.xml b/services/console-proxy/pom.xml
index baf14fc..0728f83 100644
--- a/services/console-proxy/pom.xml
+++ b/services/console-proxy/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-services</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/console-proxy/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml
index 25a6cfe..27f9bda 100644
--- a/services/console-proxy/server/pom.xml
+++ b/services/console-proxy/server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-service-console-proxy</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index b397bfe..6c498fd 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/secondary-storage/controller/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/controller/pom.xml b/services/secondary-storage/controller/pom.xml
index bf634eb..82946eb 100644
--- a/services/secondary-storage/controller/pom.xml
+++ b/services/secondary-storage/controller/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-service-secondary-storage</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/secondary-storage/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml
index b79fcaf..5abcb7c 100644
--- a/services/secondary-storage/pom.xml
+++ b/services/secondary-storage/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-services</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modules>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/services/secondary-storage/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index 2e90505..4f23bd6 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack-service-secondary-storage</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
     <properties>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/systemvm/pom.xml
----------------------------------------------------------------------
diff --git a/systemvm/pom.xml b/systemvm/pom.xml
index 1ae7450..d7d9b49 100644
--- a/systemvm/pom.xml
+++ b/systemvm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <properties>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 3c8cb0d..9811053 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
     </parent>
     <dependencies>
         <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/apidoc/pom.xml
----------------------------------------------------------------------
diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml
index 11f23e0..4fdec4d 100644
--- a/tools/apidoc/pom.xml
+++ b/tools/apidoc/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloud-tools</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index a151d20..ec3fdfb 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -24,7 +24,7 @@
     <name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>checkstyle</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     
     
     <prerequisites>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/devcloud-kvm/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/pom.xml b/tools/devcloud-kvm/pom.xml
index ffc33f9..6dc1979 100644
--- a/tools/devcloud-kvm/pom.xml
+++ b/tools/devcloud-kvm/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-tools</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/devcloud/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml
index ddceed2..bda187b 100644
--- a/tools/devcloud/pom.xml
+++ b/tools/devcloud/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-tools</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/devcloud4/pom.xml
----------------------------------------------------------------------
diff --git a/tools/devcloud4/pom.xml b/tools/devcloud4/pom.xml
index 2abea02..1161297 100644
--- a/tools/devcloud4/pom.xml
+++ b/tools/devcloud4/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-tools</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/marvin/pom.xml
----------------------------------------------------------------------
diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml
index e2f47b1..4e3b944 100644
--- a/tools/marvin/pom.xml
+++ b/tools/marvin/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloud-tools</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/pom.xml
----------------------------------------------------------------------
diff --git a/tools/pom.xml b/tools/pom.xml
index b8c5b29..1583b60 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.cloudstack</groupId>
         <artifactId>cloudstack</artifactId>
-        <version>4.7.1</version>
+        <version>4.7.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/tools/wix-cloudstack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tools/wix-cloudstack-maven-plugin/pom.xml b/tools/wix-cloudstack-maven-plugin/pom.xml
index ec3c5cb..863f473 100644
--- a/tools/wix-cloudstack-maven-plugin/pom.xml
+++ b/tools/wix-cloudstack-maven-plugin/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index a4bbd14..a29415a 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index f22e61d..87a7a4c 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <dependencies>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e29d871b/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index c7aa54e..e96b74f 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.7.1</version>
+    <version>4.7.1.1</version>
   </parent>
   <dependencies>
     <dependency>


[2/4] git commit: updated refs/heads/4.7.1.1-RC20160525T1230 to 781775a

Posted by bh...@apache.org.
CLOUDSTACK-9369: Restrict default login to ldap/native users

- Restricts default login auth handler to ldap and native-cloudstack users
- Refactors and create re-usable method to find domain by id/path
- Adds unit test for refactored method in DomainManagerImpl
- Adds smoke test for login handler

Signed-off-by: Rohit Yadav <ro...@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7619fa7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7619fa7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7619fa7

Branch: refs/heads/4.7.1.1-RC20160525T1230
Commit: c7619fa70ef51d6de83280a943a7d7f01b156129
Parents: e6af340
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Apr 27 17:34:14 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed May 25 12:20:50 2016 +0530

----------------------------------------------------------------------
 api/src/com/cloud/user/DomainService.java       |  10 ++
 server/src/com/cloud/api/ApiServer.java         |  16 +-
 .../auth/DefaultLoginAPIAuthenticatorCmd.java   |  13 ++
 .../src/com/cloud/user/DomainManagerImpl.java   |  20 +++
 .../com/cloud/user/DomainManagerImplTest.java   | 137 ++++++++++++++++++
 .../com/cloud/user/MockDomainManagerImpl.java   |   5 +
 test/integration/smoke/test_login.py            | 145 +++++++++++++++++++
 7 files changed, 335 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/api/src/com/cloud/user/DomainService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/DomainService.java b/api/src/com/cloud/user/DomainService.java
index 4c1f93d..3ccfcbc 100644
--- a/api/src/com/cloud/user/DomainService.java
+++ b/api/src/com/cloud/user/DomainService.java
@@ -56,4 +56,14 @@ public interface DomainService {
      */
     Domain findDomainByPath(String domainPath);
 
+    /**
+     * finds the domain by either id or provided path
+     *
+     * @param id the domain id
+     * @param domainPath the domain path use to lookup a domain
+     *
+     * @return domainId the long value of the domain ID, or null if no domain id exists with provided id/path
+     */
+    Domain findDomainByIdOrPath(Long id, String domainPath);
+
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index e5ae097..689ae9c 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -993,17 +993,11 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
             final Map<String, Object[]> requestParameters) throws CloudAuthenticationException {
         // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist
         // we will default to ROOT
-        if (domainId == null) {
-            if (domainPath == null || domainPath.trim().length() == 0) {
-                domainId = Domain.ROOT_DOMAIN;
-            } else {
-                final Domain domainObj = _domainMgr.findDomainByPath(domainPath);
-                if (domainObj != null) {
-                    domainId = domainObj.getId();
-                } else { // if an unknown path is passed in, fail the login call
-                    throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath);
-                }
-            }
+        final Domain userDomain = _domainMgr.findDomainByIdOrPath(domainId, domainPath);
+        if (userDomain == null || userDomain.getId() < 1L) {
+            throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath);
+        } else {
+            domainId = userDomain.getId();
         }
 
         final UserAccount userAcct = _accountMgr.authenticateUser(username, password, domainId, loginIpAddress, requestParameters);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java b/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
index d6eac78..c83e708 100644
--- a/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
+++ b/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
@@ -16,6 +16,9 @@
 // under the License.
 package com.cloud.api.auth;
 
+import com.cloud.domain.Domain;
+import com.cloud.user.User;
+import com.cloud.user.UserAccount;
 import org.apache.cloudstack.api.ApiServerService;
 import com.cloud.api.response.ApiResponseSerializer;
 import com.cloud.exception.CloudAuthenticationException;
@@ -156,6 +159,16 @@ public class DefaultLoginAPIAuthenticatorCmd extends BaseCmd implements APIAuthe
         if (username != null) {
             final String pwd = ((password == null) ? null : password[0]);
             try {
+                final Domain userDomain = _domainService.findDomainByIdOrPath(domainId, domain);
+                if (userDomain != null) {
+                    domainId = userDomain.getId();
+                } else {
+                    throw new CloudAuthenticationException("Unable to find the domain from the path " + domain);
+                }
+                final UserAccount userAccount = _accountService.getActiveUserAccount(username[0], domainId);
+                if (userAccount == null || !(User.Source.UNKNOWN.equals(userAccount.getSource()) || User.Source.LDAP.equals(userAccount.getSource()))) {
+                    throw new CloudAuthenticationException("User is not allowed CloudStack login");
+                }
                 return ApiResponseSerializer.toSerializedString(_apiServer.loginUser(session, username[0], pwd, domainId, domain, remoteAddress, params),
                         responseType);
             } catch (final CloudAuthenticationException ex) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/server/src/com/cloud/user/DomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/DomainManagerImpl.java b/server/src/com/cloud/user/DomainManagerImpl.java
index 912aa8b..71f9b67 100644
--- a/server/src/com/cloud/user/DomainManagerImpl.java
+++ b/server/src/com/cloud/user/DomainManagerImpl.java
@@ -73,6 +73,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.ReservationContextImpl;
+import com.google.common.base.Strings;
 
 @Component
 public class DomainManagerImpl extends ManagerBase implements DomainManager, DomainService {
@@ -219,6 +220,25 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
     }
 
     @Override
+    public Domain findDomainByIdOrPath(final Long id, final String domainPath) {
+        Long domainId = id;
+        if (domainId == null || domainId < 1L) {
+            if (Strings.isNullOrEmpty(domainPath) || domainPath.trim().isEmpty()) {
+                domainId = Domain.ROOT_DOMAIN;
+            } else {
+                final Domain domainVO = findDomainByPath(domainPath.trim());
+                if (domainVO != null) {
+                    return domainVO;
+                }
+            }
+        }
+        if (domainId != null && domainId > 0L) {
+            return _domainDao.findById(domainId);
+        }
+        return null;
+    }
+
+    @Override
     public Set<Long> getDomainParentIds(long domainId) {
         return _domainDao.getDomainParentIds(domainId);
     }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/server/test/com/cloud/user/DomainManagerImplTest.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/DomainManagerImplTest.java b/server/test/com/cloud/user/DomainManagerImplTest.java
new file mode 100644
index 0000000..82d5491
--- /dev/null
+++ b/server/test/com/cloud/user/DomainManagerImplTest.java
@@ -0,0 +1,137 @@
+// 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 com.cloud.user;
+
+import com.cloud.configuration.dao.ResourceCountDao;
+import com.cloud.configuration.dao.ResourceLimitDao;
+import com.cloud.dc.dao.DedicatedResourceDao;
+import com.cloud.domain.DomainVO;
+import com.cloud.domain.dao.DomainDao;
+import com.cloud.network.dao.NetworkDomainDao;
+import com.cloud.projects.ProjectManager;
+import com.cloud.projects.dao.ProjectDao;
+import com.cloud.service.dao.ServiceOfferingDao;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.user.dao.AccountDao;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.region.RegionManager;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import javax.inject.Inject;
+import java.lang.reflect.Field;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DomainManagerImplTest {
+    @Mock
+    DomainDao _domainDao;
+    @Mock
+    AccountManager _accountMgr;
+    @Mock
+    ResourceCountDao _resourceCountDao;
+    @Mock
+    AccountDao _accountDao;
+    @Mock
+    DiskOfferingDao _diskOfferingDao;
+    @Mock
+    ServiceOfferingDao _offeringsDao;
+    @Mock
+    ProjectDao _projectDao;
+    @Mock
+    ProjectManager _projectMgr;
+    @Mock
+    RegionManager _regionMgr;
+    @Mock
+    ResourceLimitDao _resourceLimitDao;
+    @Mock
+    DedicatedResourceDao _dedicatedDao;
+    @Mock
+    NetworkOrchestrationService _networkMgr;
+    @Mock
+    NetworkDomainDao _networkDomainDao;
+    @Mock
+    MessageBus _messageBus;
+
+    DomainManagerImpl domainManager;
+
+    @Before
+    public void setup() throws NoSuchFieldException, SecurityException,
+            IllegalArgumentException, IllegalAccessException {
+        domainManager = new DomainManagerImpl();
+        for (Field field : DomainManagerImpl.class.getDeclaredFields()) {
+            if (field.getAnnotation(Inject.class) != null) {
+                field.setAccessible(true);
+                try {
+                    Field mockField = this.getClass().getDeclaredField(
+                            field.getName());
+                    field.set(domainManager, mockField.get(this));
+                } catch (Exception ignored) {
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testFindDomainByIdOrPathNullOrEmpty() {
+        final DomainVO domain = new DomainVO("someDomain", 123, 1L, "network.domain");
+        Mockito.when(_domainDao.findById(1L)).thenReturn(domain);
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(null, null));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(0L, ""));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(-1L, " "));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(null, "       "));
+    }
+
+    @Test
+    public void testFindDomainByIdOrPathValidPathAndInvalidId() {
+        final DomainVO domain = new DomainVO("someDomain", 123, 1L, "network.domain");
+        Mockito.when(_domainDao.findDomainByPath(Mockito.eq("/someDomain/"))).thenReturn(domain);
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(null, "/someDomain/"));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(0L, " /someDomain/"));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(-1L, "/someDomain/ "));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(null, "   /someDomain/   "));
+    }
+
+    @Test
+    public void testFindDomainByIdOrPathInvalidPathAndInvalidId() {
+        Mockito.when(_domainDao.findDomainByPath(Mockito.anyString())).thenReturn(null);
+        Assert.assertNull(domainManager.findDomainByIdOrPath(null, "/nonExistingDomain/"));
+        Assert.assertNull(domainManager.findDomainByIdOrPath(0L, " /nonExistingDomain/"));
+        Assert.assertNull(domainManager.findDomainByIdOrPath(-1L, "/nonExistingDomain/ "));
+        Assert.assertNull(domainManager.findDomainByIdOrPath(null, "   /nonExistingDomain/   "));
+    }
+
+
+    @Test
+    public void testFindDomainByIdOrPathValidId() {
+        final DomainVO domain = new DomainVO("someDomain", 123, 1L, "network.domain");
+        Mockito.when(_domainDao.findById(1L)).thenReturn(domain);
+        Mockito.when(_domainDao.findDomainByPath(Mockito.eq("/validDomain/"))).thenReturn(new DomainVO());
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, null));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, ""));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, " "));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, "       "));
+        Assert.assertEquals(domain, domainManager.findDomainByIdOrPath(1L, "/validDomain/"));
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/server/test/com/cloud/user/MockDomainManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/user/MockDomainManagerImpl.java b/server/test/com/cloud/user/MockDomainManagerImpl.java
index cdae887..394c3e2 100644
--- a/server/test/com/cloud/user/MockDomainManagerImpl.java
+++ b/server/test/com/cloud/user/MockDomainManagerImpl.java
@@ -92,6 +92,11 @@ public class MockDomainManagerImpl extends ManagerBase implements DomainManager,
     }
 
     @Override
+    public DomainVO findDomainByIdOrPath(Long id, String domainPath) {
+        return null;
+    }
+
+    @Override
     public Set<Long> getDomainParentIds(long domainId) {
         // TODO Auto-generated method stub
         return null;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7619fa7/test/integration/smoke/test_login.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_login.py b/test/integration/smoke/test_login.py
new file mode 100644
index 0000000..5855fea
--- /dev/null
+++ b/test/integration/smoke/test_login.py
@@ -0,0 +1,145 @@
+# 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.
+
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import *
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import *
+from marvin.lib.base import *
+from marvin.lib.common import *
+
+import requests
+
+
+class TestLogin(cloudstackTestCase):
+    """
+        Tests default login API handler
+    """
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.server_details = self.config.__dict__["mgtSvr"][0].__dict__
+        self.server_url = "http://%s:8080/client/api" % self.server_details['mgtSvrIp']
+        self.testdata = {
+            "account": {
+                "email": "login-user@test.cloud",
+                "firstname": "TestLoginFirstName",
+                "lastname": "TestLoginLastName",
+                "username": "testloginuser-",
+                "password": "password123",
+            }
+        }
+        self.cleanup = []
+
+
+    def tearDown(self):
+        try:
+            cleanup_resources(self.apiclient, self.cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+
+
+    def login(self, username, password, domain="/"):
+        """
+            Logs in and returns a session to be used for subsequent API calls
+        """
+        args = {}
+        args["command"] = 'login'
+        args["username"] = username
+        args["password"] = password
+        args["domain"] = domain
+        args["response"] = "json"
+
+        session = requests.Session()
+
+        try:
+            resp = session.post(self.server_url, params=args, verify=False)
+        except requests.exceptions.ConnectionError, e:
+            self.fail("Failed to attempt login request to mgmt server")
+            return None, None
+
+        return resp, session
+
+
+    @attr(tags = ["devcloud", "advanced", "advancedns", "advancedsg", "smoke",
+                  "basic", "sg"], required_hardware="false")
+    def login_test_saml_user(self):
+        """
+            Tests that SAML users are not allowed CloudStack local log in
+
+            Creates account across various account types and converts them to
+            a SAML user and tests that they are not able to log in; then
+            converts them back as a CloudStack user account and verifies that
+            they are allowed to log in and make API requests
+        """
+        # Tests across various account types: 0=User, 1=Root Admin, 2=Domain Admin
+        for account_type in range(0, 3):
+            account = Account.create(
+                self.apiclient,
+                self.testdata['account'],
+                admin=account_type
+            )
+            self.cleanup.append(account)
+
+            username = account.user[0].username
+            password = self.testdata['account']['password']
+
+            # Convert newly created account user to SAML user
+            user_id = self.dbclient.execute("select id from user where uuid='%s'" % account.user[0].id)[0][0]
+            self.dbclient.execute("update user set source='SAML2' where id=%d" % user_id)
+
+            response, session = self.login(username, password)
+            self.assertEqual(
+                response.json()['loginresponse']['errorcode'],
+                531,
+                "SAML user should not be allowed to log in, error code 531 not returned"
+            )
+            self.assertEqual(
+                response.json()['loginresponse']['errortext'],
+                "User is not allowed CloudStack login",
+                "Invalid error message returned, SAML user should not be allowed to log in"
+            )
+
+            # Convert newly created account user back to normal source
+            self.dbclient.execute("update user set source='UNKNOWN' where id=%d" % user_id)
+
+            response, session = self.login(username, password)
+            self.assertEqual(
+                response.status_code,
+                200,
+                "Login response code was not 200"
+            )
+            self.assertTrue(
+                len(response.json()['loginresponse']['sessionkey']) > 0,
+                "Invalid session key received"
+            )
+
+            args = {}
+            args["command"] = 'listUsers'
+            args["listall"] = 'true'
+            args["response"] = "json"
+            response = session.get(self.server_url, params=args)
+            self.assertEqual(
+                response.status_code,
+                200,
+                "listUsers response code was not 200"
+            )
+            self.assertTrue(
+                len(response.json()['listusersresponse']['user']) > 0,
+                "listUsers list is empty or zero"
+            )