Replace oracle cloud with new oci provider

wallyworld · wallyworld · commit 8011adf6b889 · 2018-11-02T14:26:04.000+10:00
diff --git a/cloud/fallback-public-cloud.yaml b/cloud/fallback-public-cloud.yaml
@@ -253,17 +253,15 @@ clouds:
       zrh:
         endpoint: https://zrh.cloudsigma.com/api/2.0/
   oracle:
-    type: oracle
-    description: Oracle Cloud
-    auth-types: [ userpass ]
+    type: oci
+    description: Oracle Cloud Infrastructure
+    auth-types: [ httpsig ]
     regions:
-      uscom-central-1:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us2:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us6:
-        endpoint: https://compute.us6.oraclecloud.com
-      em2:
-        endpoint: https://compute.em2.oraclecloud.com
-      em3:
-        endpoint: https://compute.em3.oraclecloud.com
+      us-phoenix-1:
+        endpoint: https://iaas.us-phoenix-1.oraclecloud.com
+      us-ashburn-1:
+        endpoint: https://iaas.us-ashburn-1.oraclecloud.com
+      eu-frankfurt-1:
+        endpoint: https://iaas.eu-frankfurt-1.oraclecloud.com
+      uk-london-1:
+        endpoint: https://iaas.uk-london-1.oraclecloud.com
diff --git a/cloud/fallback_public_cloud.go b/cloud/fallback_public_cloud.go
@@ -260,18 +260,16 @@ clouds:
       zrh:
         endpoint: https://zrh.cloudsigma.com/api/2.0/
   oracle:
-    type: oracle
-    description: Oracle Cloud
-    auth-types: [ userpass ]
+    type: oci
+    description: Oracle Cloud Infrastructure
+    auth-types: [ httpsig ]
     regions:
-      uscom-central-1:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us2:
-        endpoint: https://compute.uscom-central-1.oraclecloud.com
-      us6:
-        endpoint: https://compute.us6.oraclecloud.com
-      em2:
-        endpoint: https://compute.em2.oraclecloud.com
-      em3:
-        endpoint: https://compute.em3.oraclecloud.com
+      us-phoenix-1:
+        endpoint: https://iaas.us-phoenix-1.oraclecloud.com
+      us-ashburn-1:
+        endpoint: https://iaas.us-ashburn-1.oraclecloud.com
+      eu-frankfurt-1:
+        endpoint: https://iaas.eu-frankfurt-1.oraclecloud.com
+      uk-london-1:
+        endpoint: https://iaas.uk-london-1.oraclecloud.com
 `
diff --git a/cmd/juju/cloud/list_test.go b/cmd/juju/cloud/list_test.go
@@ -56,7 +56,7 @@ clouds:
 	// Just check a snippet of the output to make sure it looks ok.
 	// local clouds are last.
 	// homestack should abut localhost and hence come last in the output.
-	c.Assert(out, jc.Contains, `Hypervisorhomestack          1  london           openstack   Openstack Cloud`)
+	c.Assert(out, jc.Contains, `Hypervisorhomestack          1  london         openstack   Openstack Cloud`)
 }
 
 func (s *listSuite) TestListPublicAndPersonalSameName(c *gc.C) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ clouds:`
`56`	`56`	`// Just check a snippet of the output to make sure it looks ok.`
`57`	`57`	`// local clouds are last.`
`58`	`58`	`// homestack should abut localhost and hence come last in the output.`
`59`		- c.Assert(out, jc.Contains, `Hypervisorhomestack 1 london openstack Openstack Cloud`)
	`59`	+ c.Assert(out, jc.Contains, `Hypervisorhomestack 1 london openstack Openstack Cloud`)
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func (s listSuite) TestListPublicAndPersonalSameName(c gc.C) {`