Merge pull request #72 from rpmoore/master

Adding additional Logging and Administration API calls

Author: markpaulson

build.gradle

@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '1.1.0-RC4'
+    version = '1.1.0-RC5'
 }
 
 subprojects {

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3Client.java

@@ -296,6 +296,28 @@ NotificationResponse getTapeFailureNotification(GetTapeFailureNotificationReques
 
     DeleteNotificationResponse deleteTapeFailureNotification(DeleteTapeFailureNotificationRequest request)
             throws IOException, SignatureException;
+
+    GetSystemHealthResponse getSystemHealth(GetSystemHealthRequest request)
+            throws IOException, SignatureException;
+
+    GetSystemInformationResponse getSystemInformation(GetSystemInformationRequest request)
+            throws IOException, SignatureException;
+
+    GetTapeLibrariesResponse getTapeLibraries(GetTapeLibrariesRequest request)
+            throws IOException, SignatureException;
+
+    GetTapeLibraryResponse getTapeLibrary(GetTapeLibraryRequest request)
+            throws IOException, SignatureException;
+
+    GetTapeDrivesResponse getTapeDrives(GetTapeDrivesRequest request)
+            throws IOException, SignatureException;
+
+    GetTapeDriveResponse getTapeDrive(GetTapeDriveRequest request)
+            throws IOException, SignatureException;
+
+    GetTapeFailureResponse getTapeFailure(GetTapeFailureRequest request)
+            throws IOException, SignatureException;
+
     /**
      * Creates a new Ds3Client instance for the system pointed to by Node.
      */

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientImpl.java

@@ -245,6 +245,41 @@ public DeleteNotificationResponse deleteTapeFailureNotification(DeleteTapeFailur
         return new DeleteNotificationResponse(this.netClient.getResponse(request));
     }
 
+    @Override
+    public GetSystemHealthResponse getSystemHealth(final GetSystemHealthRequest request) throws IOException, SignatureException {
+        return new GetSystemHealthResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetSystemInformationResponse getSystemInformation(final GetSystemInformationRequest request) throws IOException, SignatureException {
+        return new GetSystemInformationResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetTapeLibrariesResponse getTapeLibraries(final GetTapeLibrariesRequest request) throws IOException, SignatureException {
+        return new GetTapeLibrariesResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetTapeLibraryResponse getTapeLibrary(final GetTapeLibraryRequest request) throws IOException, SignatureException {
+        return new GetTapeLibraryResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetTapeDrivesResponse getTapeDrives(final GetTapeDrivesRequest request) throws IOException, SignatureException {
+        return new GetTapeDrivesResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetTapeDriveResponse getTapeDrive(final GetTapeDriveRequest request) throws IOException, SignatureException {
+        return new GetTapeDriveResponse(this.netClient.getResponse(request));
+    }
+
+    @Override
+    public GetTapeFailureResponse getTapeFailure(final GetTapeFailureRequest request) throws IOException, SignatureException {
+        return new GetTapeFailureResponse(this.netClient.getResponse(request));
+    }
+
     @Override
     public Ds3Client newForNode(final Node node) {
         final ConnectionDetails newConnectionDetails = ConnectionDetailsImpl.newForNode(node, this.getConnectionDetails());

ds3-sdk/src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -109,8 +109,10 @@ public WebResponse getResponse(final Ds3Request request) throws IOException, Sig
                 final CloseableHttpResponse response = requestExecutor.execute();
                 if (response.getStatusLine().getStatusCode() == HttpStatus.SC_TEMPORARY_REDIRECT) {
                     redirectCount++;
+                    LOG.debug("Performing retry - attempt: " + redirectCount);
                 }
                 else {
+                    LOG.info("Got response from server");
                     return new WebResponseImpl(response);
                 }
             } while (redirectCount < this.connectionDetails.getRetries());

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemHealthRequest.java

@@ -0,0 +1,30 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+
+public class GetSystemHealthRequest extends AbstractRequest {
+    @Override
+    public String getPath() {
+        return "/_rest_/system_health";
+    }
+
+    @Override
+    public HttpVerb getVerb() {
+        return HttpVerb.GET;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemHealthResponse.java

@@ -0,0 +1,46 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.models.SystemHealth;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GetSystemHealthResponse extends AbstractResponse {
+
+    private SystemHealth systemHealth;
+
+    public GetSystemHealthResponse(final WebResponse response) throws IOException {
+        super(response);
+    }
+
+    @Override
+    protected void processResponse() throws IOException {
+        try (final WebResponse response = getResponse()) {
+            this.checkStatusCode(200);
+            try (final InputStream inputStream = response.getResponseStream()) {
+                this.systemHealth = XmlOutput.fromXml(inputStream, SystemHealth.class);
+            }
+        }
+    }
+
+    public SystemHealth getSystemHealth() {
+        return this.systemHealth;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemInformationRequest.java

@@ -0,0 +1,30 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+
+public class GetSystemInformationRequest extends AbstractRequest {
+    @Override
+    public String getPath() {
+        return "/_rest_/system_information";
+    }
+
+    @Override
+    public HttpVerb getVerb() {
+        return HttpVerb.GET;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetSystemInformationResponse.java

@@ -0,0 +1,46 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.models.SystemInformation;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GetSystemInformationResponse extends AbstractResponse {
+
+    private SystemInformation systemInformation;
+
+    public GetSystemInformationResponse(final WebResponse response) throws IOException {
+        super(response);
+    }
+
+    @Override
+    protected void processResponse() throws IOException {
+        try (final WebResponse response = getResponse()) {
+            this.checkStatusCode(200);
+            try (final InputStream inputStream = response.getResponseStream()) {
+                this.systemInformation = XmlOutput.fromXml(inputStream, SystemInformation.class);
+            }
+        }
+    }
+
+    public SystemInformation getSystemInformation() {
+        return this.systemInformation;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetTapeDriveRequest.java

@@ -0,0 +1,39 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+
+import java.util.UUID;
+
+public class GetTapeDriveRequest extends AbstractRequest {
+
+    private final UUID id;
+
+    public GetTapeDriveRequest(final UUID id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getPath() {
+        return "/_rest_/tape_drive/" + id.toString();
+    }
+
+    @Override
+    public HttpVerb getVerb() {
+        return HttpVerb.GET;
+    }
+}

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetTapeDriveResponse.java

@@ -0,0 +1,46 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file 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.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.models.tape.TapeDrive;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GetTapeDriveResponse extends AbstractResponse {
+
+    private TapeDrive tapeDrive;
+
+    public GetTapeDriveResponse(final WebResponse response) throws IOException {
+        super(response);
+    }
+
+    @Override
+    protected void processResponse() throws IOException {
+        try (final WebResponse response = getResponse()) {
+            this.checkStatusCode(200);
+            try (final InputStream inputStream = response.getResponseStream()) {
+                this.tapeDrive = XmlOutput.fromXml(inputStream, TapeDrive.class);
+            }
+        }
+    }
+
+    public TapeDrive getTapeDrive() {
+        return tapeDrive;
+    }
+}