You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/08/14 15:07:40 UTC
[34/51] [abbrv] [partial] stratos git commit: Upgrading to jclouds
1.9.1
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_1.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_1.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_1.json
deleted file mode 100644
index 3ffcfd5..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_1.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "kind": "compute#imageList",
- "id": "projects/centos-cloud/global/images",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images",
- "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmNlbnRvcy02LTItdjIwMTIwNjIx",
- "items": [
- {
- "kind": "compute#image",
- "id": "12941197498378735318",
- "creationTimestamp": "2012-07-16T15:16:13.468-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120326",
- "name": "centos-6-2-v20120326",
- "description": "DEPRECATED. CentOS 6.2 image; Created Mon, 26 Mar 2012 21:19:09 +0000",
- "sourceType": "RAW",
- "deprecated": {
- "state": "DELETED",
- "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20130104"
- },
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12894486577628239762",
- "creationTimestamp": "2012-05-21T13:15:37.215-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120503",
- "name": "centos-6-2-v20120503",
- "description": "CentOS 6.2; Created Wed, 09 May 2012 11:55:54 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12917726455664967299",
- "creationTimestamp": "2012-06-18T11:05:30.664-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120611",
- "name": "centos-6-2-v20120611",
- "description": "CentOS 6.2; Created Mon, 11 Jun 2012 13:15:44 +0000",
- "sourceType": "RAW",
- "deprecated": {
- "state": "DEPRECATED",
- "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-20130509"
- },
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_2.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_2.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_2.json
deleted file mode 100644
index b7b736a..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_multiple_page_2.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "kind": "compute#imageList",
- "id": "projects/centos-cloud/global/images",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images",
- "nextPageToken": "CgVJTUFHRRIbZ29vZ2xlLmdjZWwtMTAtMDQtdjIwMTIxMTA2",
- "items": [
- {
- "kind": "compute#image",
- "id": "12920641029336858796",
- "creationTimestamp": "2012-06-21T22:59:56.392-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-2-v20120621",
- "name": "centos-6-2-v20120621",
- "description": "CentOS 6.2; Created Thu, 21 Jun 2012 14:22:21 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12994279803511049620",
- "creationTimestamp": "2012-09-18T08:52:47.584-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20120912",
- "name": "centos-6-v20120912",
- "description": "CentOS 6; Created Wed, 12 Sep 2012 00:00:00 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "13037720516378381209",
- "creationTimestamp": "2012-11-09T11:40:41.079-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20121106",
- "name": "centos-6-v20121106",
- "description": "SCSI-enabled CentOS 6; Created Tue, 06 Nov 2012 00:00:00 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_single_page.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_single_page.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_single_page.json
deleted file mode 100644
index a9e0ffa..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_single_page.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "kind": "compute#imageList",
- "id": "projects/centos-cloud/global/images",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images",
- "items": [
- {
- "kind": "compute#image",
- "id": "13037722963789596520",
- "creationTimestamp": "2012-11-09T11:43:28.749-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/gcel-10-04-v20121106",
- "name": "gcel-10-04-v20121106",
- "description": "SCSI-enabled GCEL 10.04 LTS; Created Tue, 06 Nov 2012 00:00:00 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "13037721421359523565",
- "creationTimestamp": "2012-11-09T11:40:51.994-08:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718",
- "name": "debian-7-wheezy-v20140718",
- "description": "SCSI-enabled GCEL 12.04 LTS; Created Tue, 06 Nov 2012 00:00:00 +0000",
- "sourceType": "RAW",
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- },
- {
- "kind": "compute#image",
- "id": "12941198995845323366",
- "creationTimestamp": "2012-07-16T15:18:50.405-07:00",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/ubuntu-10-04-v20110728",
- "name": "ubuntu-10-04-v20110728",
- "description": "DEPRECATED. GCEL 10.04 LTS; Created Thu, 28 Jul 2011 16:45:51 +0000",
- "sourceType": "RAW",
- "deprecated": {
- "state": "DELETED",
- "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/gcel-10-04-v20130104"
- },
- "rawDisk": {
- "source": "",
- "containerType": "TAR"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_add_access_config.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_add_access_config.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_add_access_config.json
deleted file mode 100644
index fe4fcf0..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_add_access_config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-POST https://www.googleapis.com/compute/v1/projects/jclouds-gce/zones/us-central1-a/instances/test-instance/addAccessConfig?network_interface=nic0&key={YOUR_API_KEY}
-
-Content-Type: application/json
-Authorization: Bearer ya29.AHES6ZRyNKVHwnMPUvZitAuA8mR8b0lcWh1bMI5UQ5bgsJ4j
-X-JavaScript-User-Agent: Google APIs Explorer
-
-{
-"name": "config1",
-"natIP": "10.0.1.1",
-"type": "ONE_TO_ONE_NAT"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_attach_disk.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_attach_disk.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_attach_disk.json
deleted file mode 100644
index 8fc35bc..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_attach_disk.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "type": "PERSISTENT",
- "mode": "READ_ONLY",
- "source": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
- "boot": false
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_get.json
deleted file mode 100644
index ca591c9..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_get.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "kind": "compute#instance",
- "id": "13051190678907570425",
- "description": "desc",
- "creationTimestamp": "2012-11-25T23:48:20.758",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-0",
- "name": "test-0",
- "machineType": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
- "status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "networkInterfaces": [
- {
- "kind": "compute#instanceNetworkInterface",
- "name": "nic0",
- "networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default"
- }
- ],
- "disks": [
- {
- "kind": "compute#instanceDisk",
- "type": "PERSISTENT",
- "mode": "READ_WRITE",
- "deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test",
- "index": 0,
- "boot": true
- }
- ],
- "serviceAccounts": [
- {
- "kind": "compute#serviceAccount",
- "email": "default",
- "scopes": [
- "myscope"
- ]
- }
- ],
- "metadata": {
- "items": [
- {
- "key": "aKey",
- "value": "aValue"
- },
- {
- "key": "jclouds-image",
- "value": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718"
- },
- {
- "key": "jclouds-delete-boot-disk",
- "value": "true"
- }
- ],
- "fingerprint": "efgh"
- },
- "tags": {
- "items": [
- "aTag"
- ],
- "fingerprint": "abcd"
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert.json
deleted file mode 100644
index 0ce3c53..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"test-0","description":"desc","machineType":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","serviceAccounts":[{"email":"default","scopes":["myscope"]}],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","accessConfigs":[{"type":"ONE_TO_ONE_NAT"}]}],"disks":[{"mode":"READ_WRITE","source":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test","deleteOnTerminate":true,"boot":false,"type":"PERSISTENT"}],"metadata":{"kind":"compute#metadata","items":[{"key":"aKey","value":"aValue"}]}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert_simple.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert_simple.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert_simple.json
deleted file mode 100644
index 038e7f8..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_insert_simple.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"test-1","machineType":"https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1","serviceAccounts":[],"networkInterfaces":[{"network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","accessConfigs":[]}]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list.json
deleted file mode 100644
index c8ed3be..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "kind": "compute#instanceList",
- "id": "projects/myproject/zones/us-central1-a/instances",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances",
- "items": [
- {
- "kind": "compute#instance",
- "id": "13051190678907570425",
- "description": "desc",
- "creationTimestamp": "2012-11-25T23:48:20.758",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/test-0",
- "name": "test-0",
- "machineType": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
- "status": "RUNNING",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "networkInterfaces": [
- {
- "kind": "compute#instanceNetworkInterface",
- "name": "nic0",
- "networkIP": "10.240.121.115",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default"
- }
- ],
- "disks": [
- {
- "kind": "compute#instanceDisk",
- "type": "PERSISTENT",
- "mode": "READ_WRITE",
- "deviceName": "test",
- "source": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/test",
- "index": 0,
- "boot": true
- }
- ],
- "serviceAccounts": [
- {
- "kind": "compute#serviceAccount",
- "email": "default",
- "scopes": [
- "myscope"
- ]
- }
- ],
- "metadata": {
- "items": [
- {
- "key": "aKey",
- "value": "aValue"
- },
- {
- "key": "jclouds-image",
- "value": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718"
- },
- {
- "key": "jclouds-delete-boot-disk",
- "value": "true"
- }
- ],
- "fingerprint": "efgh"
- },
- "tags": {
- "items": [
- "aTag"
- ],
- "fingerprint": "abcd"
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list_central1b_empty.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list_central1b_empty.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list_central1b_empty.json
deleted file mode 100644
index 51c8793..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_list_central1b_empty.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "kind": "compute#instanceList",
- "id": "projects/myproject/zones/us-central1-b/instances",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/instances",
- "items": [ ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_serial_port.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_serial_port.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_serial_port.json
deleted file mode 100644
index 03280cc..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_serial_port.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "kind": "compute#serialPortOutput",
- "contents": "console output"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_set_metadata.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_set_metadata.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_set_metadata.json
deleted file mode 100644
index b39e983..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/instance_set_metadata.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "items": [
- {
- "key": "foo",
- "value": "bar"
- }
- ],
- "fingerprint": "efgh",
- "kind": "compute#metadata"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/logback.xml b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/logback.xml
deleted file mode 100644
index 864a5a5..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/logback.xml
+++ /dev/null
@@ -1,83 +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 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>
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype.json
deleted file mode 100644
index f02f334..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "kind": "compute#machineType",
- "id": "12907738072351752276",
- "creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
- "name": "n1-standard-1",
- "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
- "guestCpus": 1,
- "memoryMb": 3840,
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "128",
- "zone": "us-central1-a"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list.json
deleted file mode 100644
index cb20853..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
- "kind": "compute#machineTypeList",
- "id": "projects/myproject/machineTypes",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes",
- "items": [
- {
- "kind": "compute#machineType",
- "id": "4618642685664990776",
- "creationTimestamp": "2013-04-25T13:32:49.088-07:00",
- "name": "f1-micro",
- "description": "1 vCPU (shared physical core) and 0.6 GB RAM",
- "guestCpus": 1,
- "memoryMb": 614,
- "maximumPersistentDisks": 4,
- "maximumPersistentDisksSizeGb": "3072",
- "zone": "us-central1-a",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/f1-micro"
- },
- {
- "kind": "compute#machineType",
- "id": "12907738072351752276",
- "creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-1",
- "name": "n1-standard-1",
- "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
- "guestCpus": 1,
- "memoryMb": 3840,
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "128",
- "zone": "us-central1-a"
- },
- {
- "kind": "compute#machineType",
- "id": "12908560709887590691",
- "creationTimestamp": "2012-06-07T20:51:19.936",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/machineTypes/n1-standard-8-d",
- "name": "n1-standard-8-d",
- "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks",
- "guestCpus": 8,
- "memoryMb": 30720,
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "1024",
- "zone": "us-central1-a"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b.json
deleted file mode 100644
index 8cbbc48..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "kind": "compute#machineTypeList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes",
- "id": "projects/abayer-jclouds-test1/zones/us-central1-b/machineTypes",
- "items": [
- {
- "kind": "compute#machineType",
- "id": "12907738072351752276",
- "creationTimestamp": "2012-06-07T20:48:14.670",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-0",
- "name": "n1-standard-0",
- "description": "1 vCPU, 3.75 GB RAM, and a 10 GB ephemeral root disk",
- "guestCpus": 1,
- "memoryMb": 3840,
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "128",
- "zone": "us-central1-b"
- },
- {
- "kind": "compute#machineType",
- "id": "12908560709887590691",
- "creationTimestamp": "2012-06-07T20:51:19.936",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes/n1-standard-8-d",
- "name": "n1-standard-8-d",
- "description": "8 vCPUs, 30 GB RAM, a 10 GB ephemeral root disk, and 2 extra 1770 GB ephemeral disks",
- "guestCpus": 8,
- "memoryMb": 30720,
- "scratchDisks": [
- {
- "diskGb": 1770
- },
- {
- "diskGb": 1770
- }
- ],
- "maximumPersistentDisks": 16,
- "maximumPersistentDisksSizeGb": "1024",
- "zone": "us-central1-b"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b_empty.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b_empty.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b_empty.json
deleted file mode 100644
index 73fe582..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/machinetype_list_central1b_empty.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "kind": "compute#machineTypeList",
- "id": "projects/myproject/zones/us-central1-b/machineTypes",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b/machineTypes",
- "items": []
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/metadata.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/metadata.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/metadata.json
deleted file mode 100644
index 5014270..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/metadata.json
+++ /dev/null
@@ -1 +0,0 @@
-{"kind":"compute#metadata","items":[{"key":"propA","value":"valueA"},{"key":"propB","value":"valueB"}],"fingerprint":"efgh"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_get.json
deleted file mode 100644
index 4a7a9cc..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_get.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "kind": "compute#network",
- "id": "13024414170909937976",
- "creationTimestamp": "2012-10-24T20:13:19.967",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/networks/jclouds-test",
- "name": "default",
- "description": "Default network for the project",
- "IPv4Range": "10.0.0.0/8",
- "gatewayIPv4": "10.0.0.1"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_insert.json
deleted file mode 100644
index 55e8331..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_insert.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"test-network","IPv4Range":"10.0.0.0/8"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_list.json
deleted file mode 100644
index 1d15f6e..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/network_list.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "kind": "compute#networkList",
- "id": "projects/myproject/networks",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/networks",
- "items": [
- {
-
- "kind": "compute#network",
- "id": "13024414170909937976",
- "creationTimestamp": "2012-10-24T20:13:19.967",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/networks/jclouds-test",
- "name": "default",
- "description": "Default network for the project",
- "IPv4Range": "10.0.0.0/8",
- "gatewayIPv4": "10.0.0.1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation.json
deleted file mode 100644
index 7ca83c8..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_error.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_error.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_error.json
deleted file mode 100644
index 157f786..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_error.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "httpErrorStatusCode": 400,
- "httpErrorMessage": "BAD REQUEST",
- "error": {
- "errors": [
- {
- "code": "RESOURCE_ALREADY_EXISTS",
- "message": "The resource 'projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance' already exists"
- }
- ]
- },
- "operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_list.json
deleted file mode 100644
index c83980d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/operation_list.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "kind": "compute#operationList",
- "id": "projects/myproject/operations",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/operations",
- "items": [
- {
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/project.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/project.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/project.json
deleted file mode 100644
index c195062..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/project.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
- "kind": "compute#project",
- "id": "13024414184846275913",
- "creationTimestamp": "2012-10-24T20:13:16.252",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject",
- "name": "myproject",
- "description": "",
- "commonInstanceMetadata": {
- "kind": "compute#metadata",
- "items": [
- {
- "key": "propA",
- "value": "valueA"
- },
- {
- "key": "propB",
- "value": "valueB"
- }
- ],
- "fingerprint": "efgh"
- },
- "quotas": [
- {
- "metric": "INSTANCES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "CPUS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "EPHEMERAL_ADDRESSES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS_TOTAL_GB",
- "usage": 0,
- "limit": 100
- },
- {
- "metric": "SNAPSHOTS",
- "usage": 0,
- "limit": 1000
- },
- {
- "metric": "NETWORKS",
- "usage": 1,
- "limit": 5
- },
- {
- "metric": "FIREWALLS",
- "usage": 2,
- "limit": 100
- },
- {
- "metric": "IMAGES",
- "usage": 0,
- "limit": 100
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/quota.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/quota.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/quota.json
deleted file mode 100644
index b631ab3..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/quota.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "metric": "INSTANCES",
- "usage": 0,
- "limit": 8
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_get.json
deleted file mode 100644
index 069865d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_get.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
- "kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "id": "12912210600542709766",
- "creationTimestamp": "2013-07-08T14:40:37.939-07:00",
- "name": "us-central1",
- "description": "us-central1",
- "status": "UP",
- "zones": [
- "https://www.googleapis.com/compute/v1/zones/us-central1-a",
- "https://www.googleapis.com/compute/v1/zones/us-central1-b"
- ],
- "quotas": [
- {
- "metric": "INSTANCES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "CPUS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "EPHEMERAL_ADDRESSES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS_TOTAL_GB",
- "usage": 0,
- "limit": 100
- },
- {
- "metric": "SNAPSHOTS",
- "usage": 0,
- "limit": 1000
- },
- {
- "metric": "NETWORKS",
- "usage": 1,
- "limit": 5
- },
- {
- "metric": "FIREWALLS",
- "usage": 2,
- "limit": 100
- },
- {
- "metric": "IMAGES",
- "usage": 0,
- "limit": 100
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_list.json
deleted file mode 100644
index ae0673e..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_list.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
- "kind": "compute#regionList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions",
- "id": "projects/myproject/regions",
- "items": [
- {
- "kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1",
- "id": "12912210600542709766",
- "creationTimestamp": "2013-07-08T14:40:37.939-07:00",
- "name": "us-central1",
- "description": "us-central1",
- "status": "UP",
- "zones": [
- "https://www.googleapis.com/compute/v1/zones/us-central1-a",
- "https://www.googleapis.com/compute/v1/zones/us-central1-b"
- ],
- "quotas": [
- {
- "metric": "INSTANCES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "CPUS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "EPHEMERAL_ADDRESSES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS_TOTAL_GB",
- "usage": 0,
- "limit": 100
- },
- {
- "metric": "SNAPSHOTS",
- "usage": 0,
- "limit": 1000
- },
- {
- "metric": "NETWORKS",
- "usage": 1,
- "limit": 5
- },
- {
- "metric": "FIREWALLS",
- "usage": 2,
- "limit": 100
- },
- {
- "metric": "IMAGES",
- "usage": 0,
- "limit": 100
- }
- ]
- },
- {
- "kind": "compute#region",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central2",
- "id": "6396763663251190992",
- "creationTimestamp": "2013-07-08T14:40:37.939-07:00",
- "name": "us-central2",
- "description": "us-central2",
- "status": "UP",
- "zones": [
- "https://www.googleapis.com/compute/v1/zones/us-central2-a"
- ],
- "quotas": [
- {
- "metric": "INSTANCES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "CPUS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "EPHEMERAL_ADDRESSES",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS",
- "usage": 0,
- "limit": 8
- },
- {
- "metric": "DISKS_TOTAL_GB",
- "usage": 0,
- "limit": 100
- },
- {
- "metric": "SNAPSHOTS",
- "usage": 0,
- "limit": 1000
- },
- {
- "metric": "NETWORKS",
- "usage": 1,
- "limit": 5
- },
- {
- "metric": "FIREWALLS",
- "usage": 2,
- "limit": 100
- },
- {
- "metric": "IMAGES",
- "usage": 0,
- "limit": 100
- }
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation.json
deleted file mode 100644
index 67ac27d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses/test-address",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation_list.json
deleted file mode 100644
index 8a6d619..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/region_operation_list.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "kind": "compute#operationList",
- "id": "projects/myproject/regions/us-central1/operations",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/operations",
- "items": [
- {
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1/addresses/test-address",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "region": "https://www.googleapis.com/compute/v1/projects/myproject/regions/us-central1"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_get.json
deleted file mode 100644
index be544f2..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_get.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-
- "kind": "compute#route",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes/default-route-c99ebfbed0e1f375",
- "id": "7241926205630356071",
- "creationTimestamp": "2013-07-08T14:40:38.502-07:00",
- "name": "default-route-c99ebfbed0e1f375",
- "description": "Default route to the virtual network.",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default",
- "destRange": "10.240.0.0/16",
- "priority": 1000,
- "nextHopNetwork": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default",
- "tags": [ "fooTag", "barTag" ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_insert.json
deleted file mode 100644
index 68fff7d..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_insert.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"default-route-c99ebfbed0e1f375","description":"Default route to the virtual network.","network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","destRange":"10.240.0.0/16","priority":1000,"nextHopNetwork":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default","tags":["fooTag","barTag"]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_list.json
deleted file mode 100644
index 5126ff1..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/route_list.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "kind": "compute#routeList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes",
- "id": "projects/myproject/global/routes",
- "items": [
- {
-
- "kind": "compute#route",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes/default-route-c99ebfbed0e1f375",
- "id": "7241926205630356071",
- "creationTimestamp": "2013-07-08T14:40:38.502-07:00",
- "name": "default-route-c99ebfbed0e1f375",
- "description": "Default route to the virtual network.",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default",
- "destRange": "10.240.0.0/16",
- "priority": 1000,
- "nextHopNetwork": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default",
- "tags": [ "fooTag", "barTag" ]
- },
- {
-
- "kind": "compute#route",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/routes/default-route-fc92a41ecb5a8d17",
- "id": "507025480040058551",
- "creationTimestamp": "2013-07-08T14:40:38.502-07:00",
- "name": "default-route-fc92a41ecb5a8d17",
- "description": "Default route to the Internet.",
- "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/default",
- "destRange": "0.0.0.0/0",
- "priority": 1000,
- "nextHopGateway": "https://www.googleapis.com/compute/v1/projects/myproject/global/gateways/default-internet-gateway"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_get.json
deleted file mode 100644
index 3ba287f..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_get.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-
- "kind": "compute#snapshot",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap",
- "id": "9734455566806191190",
- "creationTimestamp": "2013-07-26T12:54:23.173-07:00",
- "status": "READY",
- "diskSizeGb": "10",
- "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
- "name": "test-snap",
- "description": "",
- "sourceDiskId": "8243603669926824540"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_list.json
deleted file mode 100644
index 431460f..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/snapshot_list.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "kind": "compute#snapshotList",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots",
- "id": "projects/myproject/global/snapshots",
- "items": [
- {
-
- "kind": "compute#snapshot",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap",
- "id": "9734455566806191190",
- "creationTimestamp": "2013-07-26T12:54:23.173-07:00",
- "status": "READY",
- "diskSizeGb": "10",
- "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
- "name": "test-snap",
- "description": "",
- "sourceDiskId": "8243603669926824540"
- },
- {
-
- "kind": "compute#snapshot",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/snapshots/test-snap2",
- "id": "13895715048576107883",
- "creationTimestamp": "2013-07-26T12:57:01.927-07:00",
- "status": "READY",
- "diskSizeGb": "10",
- "sourceDisk": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/disks/testimage1",
- "name": "test-snap2",
- "description": "",
- "sourceDiskId": "8243603669926824540"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tag_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tag_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tag_insert.json
deleted file mode 100644
index 61ade71..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tag_insert.json
+++ /dev/null
@@ -1 +0,0 @@
-{"items":["aTag"],"fingerprint":"abcd"}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/testpk.pem
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/testpk.pem b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/testpk.pem
deleted file mode 100644
index 1443074..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/testpk.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQCwqwzakEPP+U9vx9JCuMHebFIVQZ4Sjaj2RU9dJ6YT2s3u7dC6
-/0fGM5xm4fXmSHqyGC6PC8weQSkxnSpbU+R4jMWPM8ML4TIr5wP0avbg+wy3+WWI
-of0MN7YHkCfqpaaiKiMw7niK1y07YvxJN8LX1xLpE7aXgIpn6L/qtJdHnQIDAQAB
-AoGBAIAHlcsW3W3smPrC7sdXqXeNPHcXFH0RmC7Qz9EMmLiuyqqqQagitFsYr/GH
-M3Ltd611BNi5jfUm97ly0m1ZAKp/nkTMVhfKfRIVsBDHtjQHcUOR9tr0LslptmaN
-TG0bovbUohe5KwOqMK4YOjUQbInChVBrf7VrNQtv8e0eShdpAkEA3lzLP9QYfP1i
-C4iYXqS7cgMDrs3qujC7PoyB54maen+Uvgyau1ZJpKMzXYkORPcYk+b71bl9jF80
-U+7LDnJjPwJBAMtksvL1V8DC5DYL43497JW4KBN4YZ3K7YWx/9gkvc3Q9VdXiUGu
-6WKjmcbmsPI/jFdeO71uy934N8qEXLJcyiMCQQCTNKcxWD3l8PCJZiJI9ZFKBwjX
-Hmb4X+51mBsfpw7nbbKQplOBFbynC4ujrmoN6e8RaubpNGUTGqvPrNQsejmNAkEA
-lUDEAH4BczaQ+QgoXI9ceVG2NvNzzrMHMcC5Ggd8MPhR0VIvKsAMC5I6WjcXSe1Q
-Mxy3gf84Ix7u8fHHhCuLOQJAQRhrlXiQUk4cJumNhjza5/+KtaV4FPbEQi+qcWE6
-tGoHPEBfbXyUdcUD4ae8X1W0yri0BuyVNaOCpGCBRIhPZA==
------END RSA PRIVATE KEY-----
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tokenResponse.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tokenResponse.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tokenResponse.json
deleted file mode 100644
index 6717a55..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/tokenResponse.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "access_token" : "1/8xbJqaOZXSUZbHLl5EOtu1pxz3fmmetKx9W8CV4t79M",
- "token_type" : "Bearer",
- "expires_in" : 3600
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_get.json
deleted file mode 100644
index 50cb375..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_get.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "kind": "compute#zone",
- "id": "13020128040171887099",
- "creationTimestamp": "2012-10-19T16:42:54.131",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "name": "us-central1-a",
- "description": "us-central1-a",
- "status": "DOWN",
- "maintenanceWindows": [
- {
- "name": "2012-11-10-planned-outage",
- "description": "maintenance zone",
- "beginTime": "2012-11-10T20:00:00.000",
- "endTime": "2012-12-02T20:00:00.000"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list.json
deleted file mode 100644
index ee4e17b..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "kind": "compute#zoneList",
- "id": "projects/myproject/zones",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones",
- "items": [
- {
- "kind": "compute#zone",
- "id": "13020128040171887099",
- "creationTimestamp": "2012-10-19T16:42:54.131",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "name": "us-central1-a",
- "description": "us-central1-a",
- "status": "DOWN",
- "maintenanceWindows": [
- {
- "name": "2012-11-10-planned-outage",
- "description": "maintenance zone",
- "beginTime": "2012-11-10T20:00:00.000",
- "endTime": "2012-12-02T20:00:00.000"
- }
- ]
- },
- {
- "kind": "compute#zone",
- "id": "13024414164050619686",
- "creationTimestamp": "2012-10-24T20:13:19.271",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-b",
- "name": "us-central1-b",
- "description": "us-central1-b",
- "status": "UP",
- "maintenanceWindows": [
- {
- "name": "2013-02-17-planned-outage",
- "description": "maintenance zone",
- "beginTime": "2013-02-17T08:00:00.000",
- "endTime": "2013-03-03T08:00:00.000"
- }
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list_short.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list_short.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list_short.json
deleted file mode 100644
index 711af99..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_list_short.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "kind": "compute#zoneList",
- "id": "projects/myproject/zones",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones",
- "items": [
- {
- "kind": "compute#zone",
- "id": "13020128040171887099",
- "creationTimestamp": "2012-10-19T16:42:54.131",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a",
- "name": "us-central1-a",
- "description": "us-central1-a",
- "status": "DOWN",
- "maintenanceWindows": [
- {
- "name": "2012-11-10-planned-outage",
- "description": "maintenance zone",
- "beginTime": "2012-11-10T20:00:00.000",
- "endTime": "2012-12-02T20:00:00.000"
- }
- ]
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation.json
deleted file mode 100644
index c0c5b56..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_error.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_error.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_error.json
deleted file mode 100644
index d6d054a..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_error.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "httpErrorStatusCode": 400,
- "httpErrorMessage": "BAD REQUEST",
- "error": {
- "errors": [
- {
- "code": "RESOURCE_ALREADY_EXISTS",
- "message": "The resource 'projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance' already exists"
- }
- ]
- },
- "operationType": "insert",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_list.json
deleted file mode 100644
index 77f1656..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/zone_operation_list.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "kind": "compute#operationList",
- "id": "projects/myproject/zones/us-central1-a/operations",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations",
- "items": [
- {
- "kind": "compute#operation",
- "id": "13053095055850848306",
- "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
- "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a/instances/instance-api-live-test-instance",
- "targetId": "13053094017547040099",
- "status": "DONE",
- "user": "user@developer.gserviceaccount.com",
- "progress": 100,
- "insertTime": "2012-11-28T06:41:05.060",
- "startTime": "2012-11-28T06:41:05.142",
- "endTime": "2012-11-28T06:41:06.142",
- "operationType": "insert",
- "zone": "https://www.googleapis.com/compute/v1/projects/myproject/zones/us-central1-a"
- }
- ]
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/gce/README.md
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/README.md b/dependencies/jclouds/apis/gce/README.md
deleted file mode 100644
index feadecc..0000000
--- a/dependencies/jclouds/apis/gce/README.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Why oauth & google-compute-engine forked?
-=========================================
-
-This code in Stratos is copied from Jclouds GCE [1]
-The jclouds GCE code has 2 directories oauth & google-compute-engine
-In Stratos, these two directories are mered into one.
-
-[1] https://github.com/jclouds/jclouds-labs-google/tree/jclouds-labs-google-1.8.1
-
-Custom changes
-==============
-
-1) rawDisk can be null for user created private images, hence changing the validation
-
-
-diff --git a/home/rajkumar/workspace/apache/jclouds-labs/jclouds-labs-google-jclouds-labs-google-1.8.1/google-compute-engine/src/main/java/org
-index 9ee7ea9..424aaa1 100644
---- a/home/rajkumar/workspace/apache/jclouds-labs/jclouds-labs-google-jclouds-labs-google-1.8.1/google-compute-engine/src/main/java/org/jcloud
-+++ b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/main/java/org/jclouds/googlecomputeengine/domain/Image.java
-@@ -49,7 +49,8 @@ public final class Image extends Resource {
- String sourceType, RawDisk rawDisk, Deprecated deprecated) {
- super(Kind.IMAGE, id, creationTimestamp, selfLink, name, description);
- this.sourceType = checkNotNull(sourceType, "sourceType of %s", name);
-- this.rawDisk = checkNotNull(rawDisk, "rawDisk of %s", name);
-+ // rawDisk may be null for user created private images
-+ this.rawDisk = rawDisk; // checkNotNull(rawDisk, "rawDisk of %s", name);
- this.deprecated = fromNullable(deprecated);
- }
-
-2) merging google-compute-engine/pom.xml and oauth/pom.xml
-
-diff --git a/home/rajkumar/workspace/apache/jclouds-labs/jclouds-labs-google-jclouds-labs-google-1.8.1/google-compute-engine/pom.xml b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
-index c1231f1..34f8bc7 100644
---- a/home/rajkumar/workspace/apache/jclouds-labs/jclouds-labs-google-jclouds-labs-google-1.8.1/google-compute-engine/pom.xml
-+++ b/dependencies/jclouds/apis/gce/1.8.1-stratos/pom.xml
-@@ -26,12 +26,15 @@
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.provider -->
-- <groupId>org.apache.jclouds.labs</groupId>
-- <artifactId>google-compute-engine</artifactId>
-+ <groupId>org.apache.stratos</groupId>
-+ <artifactId>gce</artifactId>
-+ <version>1.8.1-stratos</version>
- <name>jclouds Google Compute Engine provider</name>
- <description>jclouds components to access GoogleCompute</description>
-+ <packaging>bundle</packaging>
-
- <properties>
-+ <jclouds.version>1.8.1</jclouds.version>
- <test.google-compute-engine.identity>Email associated with the Google API client_id
- </test.google-compute-engine.identity>
- <test.google-compute-engine.credential>Private key (PKCS12 file) associated with the Google API client_id
-@@ -39,6 +42,13 @@
- <test.google-compute-engine.api-version>v1</test.google-compute-engine.api-version>
- <test.google-compute-engine.build-version />
- <test.google-compute-engine.template>imageId=debian-7-wheezy-v20131120,locationId=us-central1-a,minRam=2048</test.google-compute-engine.template>
-+ <jclouds.osgi.export>org.jclouds.googlecomputeengine*;version="${project.version}"</jclouds.osgi.export>
-+ <jclouds.osgi.import>
-+ org.jclouds.compute.internal;version="${jclouds.version}",
-+ org.jclouds.rest.internal;version="${jclouds.version}",
-+ org.jclouds*;version="${jclouds.version}",
-+ *
-+ </jclouds.osgi.import>
- </properties>
-
- <dependencies>
-@@ -48,19 +58,6 @@
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
-- <groupId>org.apache.jclouds.labs</groupId>
-- <artifactId>oauth</artifactId>
-- <version>${project.version}</version>
-- <type>jar</type>
-- </dependency>
-- <dependency>
-- <groupId>org.apache.jclouds.labs</groupId>
-- <artifactId>oauth</artifactId>
-- <version>${project.version}</version>
-- <type>test-jar</type>
-- <scope>test</scope>
-- </dependency>
-- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/README.md
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/README.md b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/README.md
deleted file mode 100644
index b3a1c1a..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenStack Neutron
-=================
-
-Neutron is a virtual network service for Openstack.
-
-Production ready?
-Yes
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
deleted file mode 100644
index 675323a..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-project</artifactId>
- <version>1.8.1</version>
- </parent>
-
- <!-- TODO: when out of labs, switch to org.jclouds.api -->
- <groupId>org.apache.stratos</groupId>
- <artifactId>openstack-neutron</artifactId>
- <version>1.8.1-stratosv1</version>
- <name>jclouds openstack-neutron api</name>
- <description>jclouds components to access an implementation of OpenStack Neutron</description>
- <packaging>bundle</packaging>
-
- <properties>
- <jclouds.version>1.8.1</jclouds.version>
- <!-- keystone endpoint -->
- <test.openstack-neutron.endpoint>http://localhost:5000/v2.0/</test.openstack-neutron.endpoint>
- <!-- keystone version -->
- <test.openstack-neutron.api-version>2.0</test.openstack-neutron.api-version>
- <test.openstack-neutron.build-version/>
- <test.openstack-neutron.identity>FIXME_IDENTITY</test.openstack-neutron.identity>
- <test.openstack-neutron.credential>FIXME_CREDENTIALS</test.openstack-neutron.credential>
- <test.jclouds.keystone.credential-type>passwordCredentials</test.jclouds.keystone.credential-type>
- <jclouds.osgi.export>org.jclouds.openstack.neutron.v2*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
-
- <repositories>
- <repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <!-- For modernizer, which depends on jclouds-resources snapshot. -->
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>openstack-keystone</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp</groupId>
- <artifactId>mockwebserver</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.openstack-neutron.endpoint>${test.openstack-neutron.endpoint}
- </test.openstack-neutron.endpoint>
- <test.openstack-neutron.api-version>${test.openstack-neutron.api-version}
- </test.openstack-neutron.api-version>
- <test.openstack-neutron.build-version>${test.openstack-neutron.build-version}
- </test.openstack-neutron.build-version>
- <test.openstack-neutron.identity>${test.openstack-neutron.identity}
- </test.openstack-neutron.identity>
- <test.openstack-neutron.credential>${test.openstack-neutron.credential}
- </test.openstack-neutron.credential>
- <test.jclouds.keystone.credential-type>
- ${test.jclouds.keystone.credential-type}
- </test.jclouds.keystone.credential-type>
- </systemPropertyVariables>
- <parallel>classes</parallel>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/295c545c/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java b/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
deleted file mode 100644
index 983fe94..0000000
--- a/dependencies/jclouds/apis/openstack-neutron/1.8.1-stratos/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
+++ /dev/null
@@ -1,116 +0,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.
- */
-package org.jclouds.openstack.neutron.v2;
-
-import java.io.Closeable;
-import java.util.Set;
-
-import javax.ws.rs.Path;
-
-import org.jclouds.Constants;
-import org.jclouds.location.Region;
-import org.jclouds.location.functions.RegionToEndpoint;
-import org.jclouds.openstack.neutron.v2.extensions.FloatingIPApi;
-import org.jclouds.openstack.neutron.v2.extensions.RouterApi;
-import org.jclouds.openstack.neutron.v2.extensions.SecurityGroupApi;
-import org.jclouds.openstack.neutron.v2.extensions.lbaas.v1.LBaaSApi;
-import org.jclouds.openstack.neutron.v2.features.NetworkApi;
-import org.jclouds.openstack.neutron.v2.features.PortApi;
-import org.jclouds.openstack.neutron.v2.features.SubnetApi;
-import org.jclouds.openstack.v2_0.features.ExtensionApi;
-import org.jclouds.rest.annotations.Delegate;
-import org.jclouds.rest.annotations.EndpointParam;
-
-import com.google.common.base.Optional;
-import com.google.inject.Provides;
-
-/**
- * Provides access to the OpenStack Networking (Neutron) v2 API.
- */
-@Path("{" + Constants.PROPERTY_API_VERSION + "}")
-public interface NeutronApi extends Closeable {
- /**
- * @return the Region codes configured
- */
- @Provides
- @Region
- Set<String> getConfiguredRegions();
-
- /**
- * Provides access to Extension features.
- */
- @Delegate
- ExtensionApi getExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to Network features.
- */
- @Delegate
- NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to Subnet features.
- */
- @Delegate
- SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to Port features.
- */
- @Delegate
- PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to Router features.
- *
- * <h3>NOTE</h3>
- * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type
- * to determine if it is present.
- */
- @Delegate
- Optional<RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to Floating IP features.
- *
- * <h3>NOTE</h3>
- * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type
- * to determine if it is present.
- */
- @Delegate
- Optional<FloatingIPApi> getFloatingIPApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to SecurityGroup features.
- *
- * <h3>NOTE</h3>
- * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type
- * to determine if it is present.
- */
- @Delegate
- Optional<SecurityGroupApi> getSecurityGroupApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-
- /**
- * Provides access to LBaaS features.
- *
- * <h3>NOTE</h3>
- * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type
- * to determine if it is present.
- */
- @Delegate
- Optional<LBaaSApi> getLBaaSApi(@EndpointParam(parser = RegionToEndpoint.class) String region);
-}