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/06/06 10:20:16 UTC
jclouds-labs-google git commit: Revert "support shortened hardware id"
Repository: jclouds-labs-google
Updated Branches:
refs/heads/1.9.x 276ee07e5 -> 180d11524
Revert "support shortened hardware id"
This reverts commit 8d648431580d075b24dfacb43876b9b52393c1f7.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/180d1152
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/180d1152
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/180d1152
Branch: refs/heads/1.9.x
Commit: 180d115248fac3669ce474e0c9484a3106165ac1
Parents: 276ee07
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Jun 6 12:19:16 2016 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Mon Jun 6 12:19:16 2016 +0200
----------------------------------------------------------------------
.../functions/MachineTypeToHardware.java | 9 +-
.../src/test/resources/logback.xml | 99 ++++++++++++++++----
2 files changed, 84 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/180d1152/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java
index b0887e5..a1eaf36 100644
--- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java
+++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/MachineTypeToHardware.java
@@ -54,9 +54,8 @@ public final class MachineTypeToHardware implements Function<MachineType, Hardwa
throw new IllegalStateException(
String.format("zone %s not present in %s", zoneLink, locationsByUri.get().keySet()));
}
-
return new HardwareBuilder()
- .id(buildHardwareId(zone, input.selfLink()))
+ .id(input.selfLink().toString())
.providerId(input.id())
.location(zone)
.name(input.name())
@@ -70,12 +69,6 @@ public final class MachineTypeToHardware implements Function<MachineType, Hardwa
.build();
}
- private String buildHardwareId(Location zone, URI uri) {
- String hardwareURI = uri.toString();
- String hardwareName = hardwareURI.substring(hardwareURI.lastIndexOf('/') + 1);
- return String.format("%s/%s", zone.getId(), hardwareName);
- }
-
private Iterable<Volume> collectVolumes(MachineType input) {
ImmutableSet.Builder<Volume> volumes = ImmutableSet.builder();
for (MachineType.ScratchDisk disk : input.scratchDisks()) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/180d1152/google-compute-engine/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/google-compute-engine/src/test/resources/logback.xml b/google-compute-engine/src/test/resources/logback.xml
index 367150f..864a5a5 100644
--- a/google-compute-engine/src/test/resources/logback.xml
+++ b/google-compute-engine/src/test/resources/logback.xml
@@ -1,16 +1,83 @@
-<?xml version="1.0"?>
-<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>
+<?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 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/test-data/jclouds-compute.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <appender name="SSHFILE" class="ch.qos.logback.core.FileAppender">
+ <file>target/test-data/jclouds-ssh.log</file>
+
+ <encoder>
+ <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root>
+ <level value="warn" />
+ </root>
+
+ <logger name="org.jclouds">
+ <level value="TRACE" />
+ <appender-ref ref="FILE" />
+ </logger>
+
+ <logger name="jclouds.wire">
+ <level value="TRACE" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.headers">
+ <level value="TRACE" />
+ <appender-ref ref="WIREFILE" />
+ </logger>
+
+ <logger name="jclouds.compute">
+ <level value="TRACE" />
+ <appender-ref ref="COMPUTEFILE" />
+ </logger>
+
+ <logger name="jclouds.ssh">
+ <level value="TRACE" />
+ <appender-ref ref="SSHFILE" />
+ </logger>
+
+</configuration>
+