You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2016/10/14 08:46:19 UTC
jclouds git commit: reduce payload for GET VirtualGuests
Repository: jclouds
Updated Branches:
refs/heads/master 00f7ee073 -> 2c6caa04b
reduce payload for GET VirtualGuests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2c6caa04
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2c6caa04
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2c6caa04
Branch: refs/heads/master
Commit: 2c6caa04bfc63fabb0b6434d10e5aac048934557
Parents: 00f7ee0
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Oct 13 22:03:44 2016 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Oct 14 10:45:57 2016 +0200
----------------------------------------------------------------------
.../jclouds/softlayer/features/AccountApi.java | 2 +-
.../softlayer/features/AccountApiMockTest.java | 4 +-
.../src/test/resources/logback-test.xml | 42 ++++++++++++++++++++
.../softlayer/src/test/resources/logback.xml | 34 ----------------
4 files changed, 45 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2c6caa04/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
index 05f01e0..f8c883f 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/features/AccountApi.java
@@ -45,7 +45,7 @@ public interface AccountApi {
String GUEST_MASK = "children.blockDevices.diskImage.softwareReferences.softwareDescription";
String LIST_GUEST_MASK = "powerState;operatingSystem.passwords;datacenter;billingItem;blockDevices" +
- ".diskImage;tagReferences";
+ ".diskImage;tagReferences.tag.name";
/**
* @return an account's associated virtual guest objects.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2c6caa04/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
index 46ca8e4..6c6d867 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/AccountApiMockTest.java
@@ -41,7 +41,7 @@ public class AccountApiMockTest extends BaseSoftLayerMockTest {
AccountApi api = getAccountApi(server);
try {
assertEquals(api.listVirtualGuests(), new VirtualGuestsParseTest().expected());
- assertSent(server, "GET", "/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences");
+ assertSent(server, "GET", "/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences.tag.name");
} finally {
server.shutdown();
}
@@ -52,7 +52,7 @@ public class AccountApiMockTest extends BaseSoftLayerMockTest {
AccountApi api = getAccountApi(server);
try {
assertTrue(api.listVirtualGuests().isEmpty());
- assertSent(server, "GET", "/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences");
+ assertSent(server, "GET", "/SoftLayer_Account/VirtualGuests?objectMask=powerState%3BoperatingSystem.passwords%3Bdatacenter%3BbillingItem%3BblockDevices.diskImage%3BtagReferences.tag.name");
} finally {
server.shutdown();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2c6caa04/providers/softlayer/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/resources/logback-test.xml b/providers/softlayer/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..4cac342
--- /dev/null
+++ b/providers/softlayer/src/test/resources/logback-test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<configuration scan="false">
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds.log</file>
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+ <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-wire.log</file>
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+ <appender name="COMPUTEFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/jclouds-compute.log</file>
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.jclouds">
+ <level value="DEBUG" />
+ <appender-ref ref="FILE" />
+ </logger>
+ <logger name="jclouds.compute">
+ <level value="DEBUG" />
+ <appender-ref ref="COMPUTEFILE" />
+ </logger>
+ <logger name="jclouds.wire">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+ <logger name="jclouds.headers">
+ <level value="DEBUG" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <root>
+ <level value="INFO" />
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2c6caa04/providers/softlayer/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/test/resources/logback.xml b/providers/softlayer/src/test/resources/logback.xml
deleted file mode 100644
index c823913..0000000
--- a/providers/softlayer/src/test/resources/logback.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<configuration>
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>- %msg%n</pattern>
- </encoder>
- </appender>
- <root level="info">
- <appender-ref ref="STDOUT"/>
- </root>
- <logger name="jclouds.compute" level="debug"/>
- <logger name="net.schmizz" level="warn"/>
- <logger name="jclouds.wire" level="debug"/>
- <logger name="jclouds.headers" level="debug"/>
- <logger name="jclouds.ssh" level="debug"/>
-</configuration>