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/21 09:09:48 UTC

[35/52] [abbrv] [partial] stratos git commit: Merging jclouds GCE fix with upstream - resolving conflicts

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_insert.json
deleted file mode 100644
index fabe1bd..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_insert.json
+++ /dev/null
@@ -1 +0,0 @@
-{"name":"%s","network":"https://www.googleapis.com/compute/v1/projects/myproject/global/networks/%s","sourceRanges":[%s],"sourceTags":[%s],"targetTags":[%s],"allowed":[{"IPProtocol":"tcp","ports":[%s]}]}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_list.json
deleted file mode 100644
index ab7d0b7..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/firewall_list.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-   "kind": "compute#firewallList",
-   "id": "projects/google/firewalls",
-   "selfLink": "https://www.googleapis.com/compute/v1/projects/google/global/firewalls",
-   "items": [
-      {
-
-         "kind": "compute#firewall",
-         "id": "12862241031274216284",
-         "creationTimestamp": "2012-04-13T03:05:02.855",
-         "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test",
-         "name": "jclouds-test",
-         "description": "Internal traffic from default allowed",
-         "network": "https://www.googleapis.com/compute/v1/projects/myproject/global/networks/jclouds-test",
-         "sourceRanges": [
-            "10.0.0.0/8"
-         ],
-         "allowed": [
-            {
-               "IPProtocol": "tcp",
-               "ports": [
-                  "1-65535"
-               ]
-            },
-            {
-               "IPProtocol": "udp",
-               "ports": [
-                  "1-65535"
-               ]
-            },
-            {
-               "IPProtocol": "icmp"
-            }
-         ]
-      },
-      {
-
-         "kind": "compute#firewall",
-         "id": "12862241067393040785",
-         "creationTimestamp": "2012-04-13T03:05:04.365",
-         "selfLink": "https://www.googleapis.com/compute/v1/projects/google/global/firewalls/default-ssh",
-         "name": "default-ssh",
-         "description": "SSH allowed from anywhere",
-         "network": "https://www.googleapis.com/compute/v1/projects/google/global/networks/default",
-         "sourceRanges": [
-            "0.0.0.0/0"
-         ],
-         "allowed": [
-            {
-               "IPProtocol": "tcp",
-               "ports": [
-                  "22"
-               ]
-            }
-         ]
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation.json
deleted file mode 100644
index 17d77483..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-   "kind": "compute#operation",
-   "id": "13053095055850848306",
-   "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
-   "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
-   "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete",
-   "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"
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation_list.json
deleted file mode 100644
index 32b881a..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/global_operation_list.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-   "kind": "compute#operationList",
-   "id": "projects/myproject/global/operations",
-   "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/operations",
-   "items": [
-      {
-         "kind": "compute#operation",
-         "id": "13053095055850848306",
-         "selfLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/operations/operation-1354084865060-4cf88735faeb8-bbbb12cb",
-         "name": "operation-1354084865060-4cf88735faeb8-bbbb12cb",
-         "targetLink": "https://www.googleapis.com/compute/v1/projects/myproject/global/firewalls/jclouds-test-delete",
-         "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"
-      }
-   ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_get.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_get.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_get.json
deleted file mode 100644
index 23cb0d2..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_get.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-   "kind": "compute#image",
-   "id": "12941197498378735318",
-   "creationTimestamp": "2012-07-16T22:16:13.468",
-   "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",
-   "rawDisk": {
-      "source": "",
-      "containerType": "TAR"
-   }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_insert.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_insert.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_insert.json
deleted file mode 100644
index fd030a7..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_insert.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{"sourceType": "RAW", "rawDisk": {
-   "source": "https://storage.googleapis.com/mybuket/myimage.image.tar.gz",
-   "containerType": "TAR"
-}, "kind": "compute#image", "name": "myimage"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list.json
deleted file mode 100644
index 6010f5a..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list.json
+++ /dev/null
@@ -1,24 +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": "12941197498378735318",
-         "creationTimestamp": "2012-07-16T22:16:13.468",
-         "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": "DEPRECATED",
-            "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20130104"
-         },
-         "rawDisk": {
-            "source": "",
-            "containerType": "TAR"
-         }
-      }
-   ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_centos.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_centos.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_centos.json
deleted file mode 100644
index 55e1b21..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_centos.json
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-    "kind": "compute#imageList",
-    "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images",
-    "id": "projects/centos-cloud/global/images",
-    "items": [
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20131120",
-            "id": "11748647391859510935",
-            "creationTimestamp": "2013-11-25T15:13:50.611-08:00",
-            "name": "centos-6-v20131120",
-            "description": "SCSI-enabled CentOS 6 built on 2013-11-20",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140318"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "269993565",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140318",
-            "id": "11743140967858608122",
-            "creationTimestamp": "2014-03-19T15:01:13.388-07:00",
-            "name": "centos-6-v20140318",
-            "description": "CentOS 6.5 x86_64 built on 2014-03-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140408"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "341230444",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140408",
-            "id": "18033188469723077298",
-            "creationTimestamp": "2014-04-09T10:31:57.518-07:00",
-            "name": "centos-6-v20140408",
-            "description": "CentOS 6.5 x86_64 built on 2014-04-08",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140415"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "342252847",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140415",
-            "id": "10463166969914166288",
-            "creationTimestamp": "2014-04-22T12:05:16.927-07:00",
-            "name": "centos-6-v20140415",
-            "description": "CentOS 6.5 x86_64 built on 2014-04-15",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140522"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1026663807",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140522",
-            "id": "14390164727436022001",
-            "creationTimestamp": "2014-06-03T10:21:42.109-07:00",
-            "name": "centos-6-v20140522",
-            "description": "CentOS 6.5 x86_64 built on 2014-05-22",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1028292810",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140605",
-            "id": "16310166269920012092",
-            "creationTimestamp": "2014-06-05T11:04:45.767-07:00",
-            "name": "centos-6-v20140605",
-            "description": "CentOS 6.5 x86_64 built on 2014-06-05",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1028745777",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140606",
-            "id": "6290630306542078308",
-            "creationTimestamp": "2014-06-06T13:16:42.265-07:00",
-            "name": "centos-6-v20140606",
-            "description": "CentOS 6.5 x86_64 built on 2014-06-06",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140619"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1028757792",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140619",
-            "id": "3614861379648377676",
-            "creationTimestamp": "2014-06-24T13:28:11.552-07:00",
-            "name": "centos-6-v20140619",
-            "description": "CentOS 6.5 x86_64 built on 2014-06-19",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140718"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1029860991",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/centos-cloud/global/images/centos-6-v20140718",
-            "id": "16259951858818091437",
-            "creationTimestamp": "2014-07-24T09:02:18.298-07:00",
-            "name": "centos-6-v20140718",
-            "description": "CentOS 6.5 x86_64 built on 2014-07-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1031630715",
-            "diskSizeGb": "10"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_debian.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_debian.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_debian.json
deleted file mode 100644
index c2614c9..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_debian.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-    "kind": "compute#imageList",
-    "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images",
-    "id": "projects/debian-cloud/global/images",
-    "items": [
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20131127",
-            "id": "12371298324486102144",
-            "creationTimestamp": "2013-12-02T17:49:01.206-08:00",
-            "name": "backports-debian-7-wheezy-v20131127",
-            "description": "Debian GNU/Linux 7.2 (wheezy) with backports kernel built on 2013-11-27",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140318"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "365056004",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140318",
-            "id": "4359542978415320596",
-            "creationTimestamp": "2014-03-19T14:59:48.212-07:00",
-            "name": "backports-debian-7-wheezy-v20140318",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 with backports kernel built on 2014-03-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140331"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "363791902",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140331",
-            "id": "15835408046770346721",
-            "creationTimestamp": "2014-04-02T13:22:10.344-07:00",
-            "name": "backports-debian-7-wheezy-v20140331",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 with backports kernel and SSH packages built on 2014-03-31",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140408"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "442398181",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140408",
-            "id": "11347897274148340677",
-            "creationTimestamp": "2014-04-09T10:34:36.072-07:00",
-            "name": "backports-debian-7-wheezy-v20140408",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 with backports kernel and SSH packages built on 2014-04-08",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140415"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "460293681",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140415",
-            "id": "1961353585117201359",
-            "creationTimestamp": "2014-04-22T12:05:21.799-07:00",
-            "name": "backports-debian-7-wheezy-v20140415",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 with backports kernel and SSH packages built on 2014-04-15",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140522"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1305361944",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140522",
-            "id": "9086860851120583043",
-            "creationTimestamp": "2014-06-03T10:22:40.439-07:00",
-            "name": "backports-debian-7-wheezy-v20140522",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 with backports kernel and SSH packages built on 2014-05-22",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1291544127",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140605",
-            "id": "3162880700849242534",
-            "creationTimestamp": "2014-06-05T11:15:06.942-07:00",
-            "name": "backports-debian-7-wheezy-v20140605",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 with backports kernel and SSH packages built on 2014-06-05",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1342678611",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140606",
-            "id": "10385475893990329896",
-            "creationTimestamp": "2014-06-06T13:16:42.088-07:00",
-            "name": "backports-debian-7-wheezy-v20140606",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 with backports kernel and SSH packages built on 2014-06-06",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140619"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1356729999",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140619",
-            "id": "15689321734978914353",
-            "creationTimestamp": "2014-06-24T13:29:10.490-07:00",
-            "name": "backports-debian-7-wheezy-v20140619",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 with backports kernel and SSH packages built on 2014-06-19",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140718"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1281043596",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/backports-debian-7-wheezy-v20140718",
-            "id": "12577251946941921963",
-            "creationTimestamp": "2014-07-24T09:10:05.365-07:00",
-            "name": "backports-debian-7-wheezy-v20140718",
-            "description": "Debian GNU/Linux 7.6 (wheezy) amd64 with backports kernel and SSH packages built on 2014-07-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1335987075",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20131014",
-            "id": "2768298251193329825",
-            "creationTimestamp": "2013-10-28T13:52:08.233-07:00",
-            "name": "debian-7-wheezy-v20131014",
-            "description": "Debian GNU/Linux 7.2 (wheezy) built on 2013-10-14",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
-                "deprecated": "2013-12-02T12:00:00Z"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "405683884",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
-            "id": "17312518942796567788",
-            "creationTimestamp": "2013-11-25T15:17:00.436-08:00",
-            "name": "debian-7-wheezy-v20131120",
-            "description": "Debian GNU/Linux 7.2 (wheezy) built on 2013-11-20",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140318"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "341857472",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140318",
-            "id": "17164003659829548087",
-            "creationTimestamp": "2014-03-19T15:00:34.317-07:00",
-            "name": "debian-7-wheezy-v20140318",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 built on 2014-03-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140408"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "357365652",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140408",
-            "id": "5009074516965108296",
-            "creationTimestamp": "2014-04-09T10:32:46.862-07:00",
-            "name": "debian-7-wheezy-v20140408",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 built on 2014-04-08",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140415"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "387525228",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140415",
-            "id": "17362901286054305778",
-            "creationTimestamp": "2014-04-22T12:05:19.303-07:00",
-            "name": "debian-7-wheezy-v20140415",
-            "description": "Debian GNU/Linux 7.4 (wheezy) amd64 built on 2014-04-15",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140522"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1151530332",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140522",
-            "id": "5741466168076626639",
-            "creationTimestamp": "2014-06-03T10:22:05.775-07:00",
-            "name": "debian-7-wheezy-v20140522",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 built on 2014-05-22",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1129290498",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140605",
-            "id": "15036511115619902874",
-            "creationTimestamp": "2014-06-05T11:10:23.037-07:00",
-            "name": "debian-7-wheezy-v20140605",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 built on 2014-06-05",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140606"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1064425338",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140606",
-            "id": "16280724435269635469",
-            "creationTimestamp": "2014-06-06T13:16:42.897-07:00",
-            "name": "debian-7-wheezy-v20140606",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 built on 2014-06-06",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140619"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1108438332",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140619",
-            "id": "15990799122418306096",
-            "creationTimestamp": "2014-06-24T13:28:42.697-07:00",
-            "name": "debian-7-wheezy-v20140619",
-            "description": "Debian GNU/Linux 7.5 (wheezy) amd64 built on 2014-06-19",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "deprecated": {
-                "state": "DEPRECATED",
-                "replacement": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1158839577",
-            "diskSizeGb": "10"
-        },
-        {
-            "kind": "compute#image",
-            "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images/debian-7-wheezy-v20140718",
-            "id": "11535450626613878896",
-            "creationTimestamp": "2014-07-24T09:06:16.694-07:00",
-            "name": "debian-7-wheezy-v20140718",
-            "description": "Debian GNU/Linux 7.6 (wheezy) amd64 built on 2014-07-18",
-            "sourceType": "RAW",
-            "rawDisk": {
-                "source": "",
-                "containerType": "TAR"
-            },
-            "status": "READY",
-            "archiveSizeBytes": "1195066695",
-            "diskSizeGb": "10"
-        }
-    ]
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_empty.json
----------------------------------------------------------------------
diff --git a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_empty.json b/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_empty.json
deleted file mode 100644
index f082e08..0000000
--- a/dependencies/jclouds/apis/gce/1.8.1-stratos/src/test/resources/image_list_empty.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-   "kind": "compute#imageList",
-   "id": "projects/debian-cloud/global/images",
-   "selfLink": "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/images",
-   "items": [ ]
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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/897edde8/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