release 1.0.21 code

connectors/http-connector/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.huawei.openstack4j.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>1.0.19</version>
+        <version>1.0.21</version>
     </parent>
     <name>OpenStack4j HttpURL Connector</name>
     <artifactId>openstack4j-http-connector</artifactId>

connectors/httpclient/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-httpclient</artifactId>

connectors/jersey2/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-jersey2</artifactId>

connectors/okhttp/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.huawei.openstack4j.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>1.0.19</version>
+        <version>1.0.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-okhttp</artifactId>

connectors/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.huawei</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>1.0.19</version>
+        <version>1.0.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.huawei.openstack4j.connectors</groupId>

connectors/resteasy/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-resteasy</artifactId>

core-functional-test/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<artifactId>openstack4j-core-functional-test</artifactId>
 	<name>OpenStack4j Core Functional Test Cases</name>

core-integration-test/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core-integration-test</artifactId>

core-sample/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<artifactId>openstack-core-sample</artifactId>
 	<name>OpenStack4j Sample</name>

core-test/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core-test</artifactId>

core-test/src/main/resources/compute/server_console_output.json

@@ -1,3 +1,3 @@
 {
-	"output": "open-vm-tools: not starting as this is not a VMware VM\nlandscape-client is not configured, please run landscape-config.\n * Stopping save kernel messages[74G[ OK ]\n * Stopping CPU interrupts balancing daemon[74G[ OK ]\n * Starting automatic crash report generation[74G[ OK ]\n * Restoring resolver state...       [80G [74G[ OK ]\n * Starting Seed the pseudo random number generator on first boot[74G[[31mfail[39;49m]\n * Stopping System V runlevel compatibility[74G[ OK ]\nGenerating locales...\n  en_US.UTF-8... up-to-date\nGeneration complete.\n\nUbuntu 14.04.1 LTS 05184ba3-00ba-4fbc-b7a2-03b62b884931 ttyS0\n\n05184ba3-00ba-4fbc-b7a2-03b62b884931 login: Cloud-init v. 0.7.5 running 'modules:final' at Fri, 24 Feb 2017 17:01:09 +0000. Up 22.35 seconds.\n\nci-info: ++++++++++Authorized keys from /home/ubuntu/.ssh/authorized_keys for user ubuntu+++++++++++\nci-info: +---------+-------------------------------------------------+---------+-------------------+\nci-info: | Keytype |                Fingerprint (md5)                | Options |      Comment      |\nci-info: +---------+-------------------------------------------------+---------+-------------------+\nci-info: | ssh-rsa | 93:99:62:d3:db:ec:d9:b1:8b:95:dd:a4:b2:80:2a:04 |    -    | Generated-by-Nova |\nci-info: +---------+-------------------------------------------------+---------+-------------------+\nec2: \nec2: #############################################################\nec2: -----BEGIN SSH HOST KEY FINGERPRINTS-----\nec2: 1024 7e:05:9e:2c:11:98:40:65:88:7b:f5:19:cc:fa:22:04  root@05184ba3-00ba-4fbc-b7a2-03b62b884931 (DSA)\nec2: 256 31:04:ad:9f:f6:4b:b3:9c:f7:ef:77:e5:8c:13:0d:88  root@05184ba3-00ba-4fbc-b7a2-03b62b884931 (ECDSA)\nec2: 2048 27:23:99:cd:4f:77:95:06:72:e1:ed:81:73:d4:d2:df  root@05184ba3-00ba-4fbc-b7a2-03b62b884931 (RSA)\nec2: -----END SSH HOST KEY FINGERPRINTS-----\nec2: #############################################################\n-----BEGIN SSH HOST KEY KEYS-----\necdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGAuTHYYc8PW2ASU/qeqt6b9aP5QHr+sLKNZ+COeEBjEcSPcXfWLOTvvhaYtd7qV/BJ64brpRgnMaPVYkkGYw58= root@05184ba3-00ba-4fbc-b7a2-03b62b884931\nssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD32ZzkFehp0d6Iq3GcSTBeIt5Wx97g7JtsD/hVbv/8iQQzdMB4/M2wZ796FbqECEsi34+NUCm0RazLIBpeQ26Q9ffFMMag7T+0RypeeDYnj/2mr8KZbSM+Fj7o6E2JFlfPRDVlNhP1UMY8TeMr4T7tEs6IYEmxyBrXCNJ5aPxbfTVQrq9dphDhCtM/sBofbR3T71lgvTgHmZJp7ItFOokIa1LWs6uMP3LEROBmyTHDYPBDrTmaFZkx5gG0mBQlU2QqfA/7XSApLDZmCr/s7xgMfKy0NwONu/biNfFoPgRFKPM1NrV86P7CFMEyjN05bYAFe4xhO2tg2vjM07kxO2zr root@05184ba3-00ba-4fbc-b7a2-03b62b884931\n-----END SSH HOST KEY KEYS-----\nCloud-init v. 0.7.5 finished at Fri, 24 Feb 2017 17:01:10 +0000. Datasource DataSourceOpenStack [net,ver=2].  Up 22.60 seconds\n"
+	"output": ""
 }

core-test/src/main/resources/database/list_errorlog_response.json

@@ -6,47 +6,47 @@
     },
     {
       "datetime": "2017-08-10 03:15:08",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:58",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:58",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:57",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:52",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:52",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:52",
       "content": "[Warning] 'user' entry '@host-172-16-1-176' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:52",
-      "content": "[Warning] 'user' entry 'root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'user' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:51",
-      "content": "[Warning] 'proxies_priv' entry '@ root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'proxies_priv' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:51",
       "content": "[Warning] 'user' entry '@host-172-16-1-176' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:51",
-      "content": "[Warning] 'user' entry 'root@host-172-16-1-176' ignored in --skip-name-resolve mode."
+      "content": "[Warning] 'user' entry '' ignored in --skip-name-resolve mode."
     },
     {
       "datetime": "2017-08-09 09:48:51",

core/pom.xml

@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.19</version>
+		<version>1.0.21</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core</artifactId>
@@ -185,7 +185,7 @@
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.5.3</version>
+					<version>3.5.0</version>
 					<executions>
 						<!-- Generate bundle manifest -->
 						<execution>

core/src/main/java/com/huawei/openstack4j/api/identity/v3/RoleService.java

@@ -219,4 +219,14 @@ public interface RoleService extends RestService {
      * @return the ActionResponse
      */
     ActionResponse checkDomainGroupRole(String domainId, String groupId, String roleId);
+
+    /**
+     * grant a role to a specified group on all projects
+     *
+     * @param domainId the domain id
+     * @param groupId the group id
+     * @param roleId the role id
+     * @return the ActionResponse
+     */
+    ActionResponse grantGroupAllProjectsRole(String domainId, String groupId, String roleId);
 }

core/src/main/java/com/huawei/openstack4j/api/identity/v3/TokenService.java

@@ -23,6 +23,7 @@
 import com.huawei.openstack4j.model.identity.v3.Project;
 import com.huawei.openstack4j.model.identity.v3.Service;
 import com.huawei.openstack4j.model.identity.v3.Token;
+import com.huawei.openstack4j.openstack.identity.v3.domain.token.Auth;
 
 /**
  * Identity V3 Token operations
@@ -32,11 +33,27 @@ public interface TokenService extends RestService {
 
     /***
      * Validates and shows information for a token.
-     * 
+     *
      * @param tokenId the identifier of the token that is subject to be checked
      * @return the token if valid
      */
     Token get(String tokenId);
+
+    /***
+     * Validates and shows information for a token.
+     *
+     * @param tokenId the identifier of the token that is subject to be checked
+     * @return the token without catalog if valid
+     */
+    Token getWithoutCatalog(String tokenId, String nocatalog);
+
+    /***
+     * token.
+     *
+     * @param nocatalog if not empty , return token without catalog
+     * @return the token
+     */
+    Token create(String nocatalog, Auth auth);
 
     /**
      * Validates a token.
@@ -57,7 +74,14 @@ public interface TokenService extends RestService {
     /**
      * Get service catalog for specified token
      *
+     * @return the service catalog for the token provided in the request
+     */
+    List<? extends Service> getServiceCatalog();
+
+    /**
+     * Get service catalog for specified token
      * @param tokenId the identifier of the token, of which the catalog of services is requested
+     *
      * @return the service catalog for the token provided in the request
      */
     List<? extends Service> getServiceCatalog(String tokenId);

core/src/main/java/com/huawei/openstack4j/core/transport/ClientConstants.java

@@ -86,6 +86,13 @@ public final class ClientConstants {
     public static final String PATH_SERVICE_CATALOGS = "auth/catalog";
     public static final String PATH_TENANTS = "/tenants";
     public static final String PATH_ARTIFACTS = "/artifacts";
+    public static final String PATH_IAM_USERS = "/OS-USER/users";
+    public static final String PATH_IAM_INFO = "/info";
+    public static final String PATH_IAM_CREDENTIALS = "/OS-CREDENTIAL";
+    public static final String PATH_IAM_ROLES = "/OS-ROLE/roles";
+    public static final String PATH_IAM_AGENCIES = "/OS-AGENCY";
+
+
 
     // DNS/Designate
     public static final String PATH_ZONES = "/zones";

core/src/main/java/com/huawei/openstack4j/model/identity/v3/Project.java

@@ -69,6 +69,12 @@ public interface Project extends ModelEntity, Buildable<ProjectBuilder> {
      */
     String getParentId();
 
+    /**
+     *
+     * @return if the project id a domain
+     */
+    Boolean  getIsDomain();
+
     /**
      * 
      * @return the subtree of the project

core/src/main/java/com/huawei/openstack4j/model/identity/v3/Role.java

@@ -70,6 +70,21 @@ public interface Role extends ModelEntity, Buildable<RoleBuilder> {
      */
     String getDescription();
 
+    /**
+     * @return the updated time
+     */
+    String getUpdatedTime();
+
+    /**
+     * @return the created time
+     */
+    String getCreatedTime();
+
+    /**
+     * @return the Chinese description of the role
+     */
+    String getDescriptionCn();
+
     /**
      * @return the policy of the role
      */

core/src/main/java/com/huawei/openstack4j/model/identity/v3/Token.java

@@ -39,6 +39,7 @@
 import com.huawei.openstack4j.model.ModelEntity;
 import com.huawei.openstack4j.model.identity.AuthStore;
 import com.huawei.openstack4j.model.identity.AuthVersion;
+import com.huawei.openstack4j.openstack.identity.v3.domain.token.AssumedBy;
 
 /**
  * V3 token model
@@ -57,6 +58,11 @@ public interface Token extends ModelEntity {
      */
     List<? extends Service> getCatalog();
 
+    /**
+     * @return the entity assumed by
+     */
+    AssumedBy getAssumedBy();
+
     /**
      * @return the timestamp when the token expires
      */

core/src/main/java/com/huawei/openstack4j/model/identity/v3/builder/EndpointBuilder.java

@@ -84,4 +84,5 @@ public interface EndpointBuilder extends Builder<EndpointBuilder, Endpoint> {
      */
     EndpointBuilder enabled(boolean enabled);
 
+
 }

core/src/main/java/com/huawei/openstack4j/model/identity/v3/builder/ProjectBuilder.java

@@ -39,6 +39,12 @@ public interface ProjectBuilder extends Builder<ProjectBuilder, Project> {
      */
     ProjectBuilder domainId(String domainId);
 
+    /**
+     *
+     * @see Project#getIsDomain()
+     */
+    ProjectBuilder isDomain(Boolean isDomain);
+
     /**
      * Accepts an existing domain and uses its id
      * 

core/src/main/java/com/huawei/openstack4j/model/identity/v3/builder/RoleBuilder.java

@@ -67,6 +67,21 @@ public interface RoleBuilder extends Builder<RoleBuilder, Role> {
      */
     RoleBuilder description(String description);
 
+    /**
+     * @see Role#getUpdatedTime()
+     */
+    RoleBuilder updatedTime(String updatedTime);
+
+    /**
+     * @see Role#getCreatedTime()
+     */
+    RoleBuilder createdTime(String createdTime);
+
+    /**
+     * @see Role#getDescriptionCn()
+     */
+    RoleBuilder descriptionCn(String descriptionCn);
+
     /**
      * @see Role#getPolicy()
      */