release 1.0.25 code

huaweicloud · Aug 31, 2020 · 8b86cf1 · 8b86cf1
1 parent 980a550
commit 8b86cf1
Show file tree

Hide file tree

Showing 46 changed files with 476 additions and 101 deletions.
diff --git a/codedex_java.sh b/codedex_java.sh
diff --git a/connectors/http-connector/pom.xml b/connectors/http-connector/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.huawei.openstack4j.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>1.0.24</version>
+        <version>1.0.25</version>
     </parent>
     <name>OpenStack4j HttpURL Connector</name>
     <artifactId>openstack4j-http-connector</artifactId>

diff --git a/connectors/http-connector/scalastyle-result.xml b/connectors/http-connector/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/connectors/httpclient/pom.xml b/connectors/httpclient/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-httpclient</artifactId>

diff --git a/connectors/httpclient/scalastyle-result.xml b/connectors/httpclient/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/connectors/jersey2/pom.xml b/connectors/jersey2/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-jersey2</artifactId>

diff --git a/connectors/jersey2/scalastyle-result.xml b/connectors/jersey2/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/connectors/okhttp/pom.xml b/connectors/okhttp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.huawei.openstack4j.connectors</groupId>
         <artifactId>openstack4j-connectors</artifactId>
-        <version>1.0.24</version>
+        <version>1.0.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>openstack4j-okhttp</artifactId>

diff --git a/connectors/okhttp/scalastyle-result.xml b/connectors/okhttp/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/connectors/pom.xml b/connectors/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.huawei</groupId>
         <artifactId>openstack4j-parent</artifactId>
-        <version>1.0.24</version>
+        <version>1.0.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.huawei.openstack4j.connectors</groupId>

diff --git a/connectors/resteasy/pom.xml b/connectors/resteasy/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei.openstack4j.connectors</groupId>
 		<artifactId>openstack4j-connectors</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-resteasy</artifactId>

diff --git a/connectors/resteasy/scalastyle-result.xml b/connectors/resteasy/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/connectors/scalastyle-result.xml b/connectors/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/core-functional-test/pom.xml b/core-functional-test/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<artifactId>openstack4j-core-functional-test</artifactId>
 	<name>OpenStack4j Core Functional Test Cases</name>

diff --git a/core-functional-test/scalastyle-result.xml b/core-functional-test/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/core-integration-test/pom.xml b/core-integration-test/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core-integration-test</artifactId>

diff --git a/core-sample/pom.xml b/core-sample/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<artifactId>openstack-core-sample</artifactId>
 	<name>OpenStack4j Sample</name>

diff --git a/core-sample/scalastyle-result.xml b/core-sample/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/core-test/pom.xml b/core-test/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core-test</artifactId>

diff --git a/core-test/scalastyle-result.xml b/core-test/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/core-test/src/main/java/com/huawei/openstack4j/api/storage/VolumeTests.java b/core-test/src/main/java/com/huawei/openstack4j/api/storage/VolumeTests.java
@@ -110,7 +110,7 @@ public void getVolumeV1() throws Exception {
     public void getVolumeV2() throws Exception {
         // Check get volume
         respondWith("/storage/v2/volume.json");
-        Volume volume = osv3().blockStorage().volumes().get("8a9287b7-4f4d-4213-8d75-63470f19f27c");
+        Volume volume = osv3().blockStorage().volumes().get("de3108dd-860c-43bc-a572-42a47f561582");
 
         RecordedRequest getRequest = server.takeRequest();
         assertTrue(getRequest.getPath().matches("/v[12]/project-id/volumes/8a9287b7-4f4d-4213-8d75-63470f19f27c"));

diff --git a/core-test/src/main/resources/storage/v2/volume.json b/core-test/src/main/resources/storage/v2/volume.json
@@ -27,6 +27,7 @@
         "name": "test-volume",
         "replication_status": "disabled",
         "consistencygroup_id": null,
+        "os-vol-mig-status-attr:migstat": "error",
         "source_volid": "11111111-1111-1111-1111-111111111111",
         "snapshot_id": "22222222-2222-2222-2222-222222222222",
         "os-volume-replication:extended_status": null,

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>com.huawei</groupId>
 		<artifactId>openstack4j-parent</artifactId>
-		<version>1.0.24</version>
+		<version>1.0.25</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>openstack4j-core</artifactId>

diff --git a/core/scalastyle-result.xml b/core/scalastyle-result.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<checkstyle version="5.0">
+
+    </checkstyle>
diff --git a/core/src/main/java/com/huawei/openstack4j/api/compute/ServerService.java b/core/src/main/java/com/huawei/openstack4j/api/compute/ServerService.java
@@ -54,6 +54,8 @@
 import com.huawei.openstack4j.model.compute.actions.LiveMigrateOptions;
 import com.huawei.openstack4j.model.compute.actions.RebuildOptions;
 import com.huawei.openstack4j.model.compute.builder.ServerCreateBuilder;
+import com.huawei.openstack4j.openstack.compute.domain.NovaRemoteConsole;
+import com.huawei.openstack4j.openstack.compute.domain.NovaRemoteConsoleResponse;
 
 /**
  * Server Operations API
@@ -259,6 +261,16 @@ public interface ServerService {
      */
     String getConsoleOutput(String serverId, int numLines);
 
+    /**
+     * This API is used to obtain the address for remotely logging in to an ECS using VNC.
+     *
+     * @param serverId      Specifies the ECS ID.
+     * @param remoteConsole Obtains the address for remotely logging in to an ECS using VNC.
+     * @param headers Request header
+     * @return Obtains the address for remotely logging in to an ECS
+     */
+    NovaRemoteConsoleResponse getRemoteConsole(String serverId, NovaRemoteConsole remoteConsole, Map<String, String> headers);
+
     /**
      * Obtains the VNC Console connection information for the given server and VNC Console Type
      * 

diff --git a/core/src/main/java/com/huawei/openstack4j/model/storage/block/Volume.java b/core/src/main/java/com/huawei/openstack4j/model/storage/block/Volume.java
@@ -81,7 +81,7 @@ public static Status fromValue(String status) {
 	}
 
 	public enum MigrationStatus {
-	    NONE, MIGRATING
+	    NONE, MIGRATING, SUCCESS, STARTING, DELETING, ERROR
 	    ;
 
 	    @JsonValue

diff --git a/core/src/main/java/com/huawei/openstack4j/openstack/compute/domain/NovaRemoteConsole.java b/core/src/main/java/com/huawei/openstack4j/openstack/compute/domain/NovaRemoteConsole.java
@@ -0,0 +1,24 @@
+package com.huawei.openstack4j.openstack.compute.domain;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.huawei.openstack4j.model.ModelEntity;
+import lombok.*;
+
+@Getter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonRootName("remote_console")
+public class NovaRemoteConsole implements ModelEntity {
+
+    /**
+     * 远程登录的类型，请将type配置为“novnc”。
+     */
+    private String type;
+
+    /**
+     * 远程登录协议，请将protocol配置为“vnc”。
+     */
+    private String protocol;
+}
diff --git a/.../main/java/com/huawei/openstack4j/openstack/compute/domain/NovaRemoteConsoleResponse.java b/.../main/java/com/huawei/openstack4j/openstack/compute/domain/NovaRemoteConsoleResponse.java
@@ -0,0 +1,31 @@
+package com.huawei.openstack4j.openstack.compute.domain;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.huawei.openstack4j.model.ModelEntity;
+import lombok.*;
+
+@Getter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonRootName("remote_console")
+public class NovaRemoteConsoleResponse implements ModelEntity {
+
+    /**
+     * 远程登录的类型
+     */
+    private String type;
+
+    /**
+     * 远程登录协议
+     */
+    private String protocol;
+
+    /**
+     * 远程登录的url。
+     *
+     * 该url有效时间10min，超过10min请重新获取。
+     */
+    private String url;
+}
diff --git a/core/src/main/java/com/huawei/openstack4j/openstack/compute/internal/ServerServiceImpl.java b/core/src/main/java/com/huawei/openstack4j/openstack/compute/internal/ServerServiceImpl.java
@@ -38,6 +38,7 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import com.huawei.openstack4j.openstack.compute.domain.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,20 +67,9 @@
 import com.huawei.openstack4j.model.compute.actions.RebuildOptions;
 import com.huawei.openstack4j.model.compute.builder.ServerCreateBuilder;
 import com.huawei.openstack4j.openstack.common.Metadata;
-import com.huawei.openstack4j.openstack.compute.domain.AdminPass;
-import com.huawei.openstack4j.openstack.compute.domain.ConsoleOutput;
-import com.huawei.openstack4j.openstack.compute.domain.ConsoleOutputOptions;
-import com.huawei.openstack4j.openstack.compute.domain.MetadataItem;
-import com.huawei.openstack4j.openstack.compute.domain.NovaPassword;
-import com.huawei.openstack4j.openstack.compute.domain.NovaServer;
 import com.huawei.openstack4j.openstack.compute.domain.NovaServer.Servers;
-import com.huawei.openstack4j.openstack.compute.domain.NovaServerCreate;
-import com.huawei.openstack4j.openstack.compute.domain.NovaServerUpdate;
-import com.huawei.openstack4j.openstack.compute.domain.NovaVNCConsole;
-import com.huawei.openstack4j.openstack.compute.domain.NovaVolumeAttachment;
 import com.huawei.openstack4j.openstack.compute.domain.actions.BackupAction;
 import com.huawei.openstack4j.openstack.compute.domain.actions.BasicActions;
-import com.huawei.openstack4j.openstack.compute.domain.actions.BasicActions.ChangePassword;
 import com.huawei.openstack4j.openstack.compute.domain.actions.BasicActions.ConfirmResize;
 import com.huawei.openstack4j.openstack.compute.domain.actions.BasicActions.Migrate;
 import com.huawei.openstack4j.openstack.compute.domain.actions.BasicActions.Reboot;
@@ -364,6 +354,23 @@ public String getConsoleOutput(String serverId, int numLines) {
 		return (c != null) ? c.getOutput() : null;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public NovaRemoteConsoleResponse getRemoteConsole(String serverId, NovaRemoteConsole remoteConsole, Map<String, String> headers) {
+		checkNotNull(serverId);
+		checkNotNull(remoteConsole);
+		checkNotNull(remoteConsole.getProtocol());
+		checkNotNull(remoteConsole.getType());
+		checkNotNull(headers);
+
+		return post(NovaRemoteConsoleResponse.class, uri("/servers/%s/remote-consoles", serverId))
+				.entity(remoteConsole).headers(headers)
+				.execute();
+	}
+
+
 	/**
 	 * {@inheritDoc}
 	 */

diff --git a/core/src/main/java/com/huawei/openstack4j/openstack/ecs/v1/domain/RemoteConsole.java b/core/src/main/java/com/huawei/openstack4j/openstack/ecs/v1/domain/RemoteConsole.java
@@ -0,0 +1,24 @@
+package com.huawei.openstack4j.openstack.ecs.v1.domain;
+
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.huawei.openstack4j.model.ModelEntity;
+import lombok.*;
+
+@Getter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonRootName("remote_console")
+public class RemoteConsole implements ModelEntity {
+
+    /**
+     * 远程登录的类型，请将type配置为“novnc”。
+     */
+    private String type;
+
+    /**
+     * 远程登录协议，请将protocol配置为“vnc”。
+     */
+    private String protocol;
+}