Merge pull request juju#7810 from axw/oracle-release-import-volumes

provider/oracle: release/import volume support ## Description of change Add support for releasing and import volumes from/into an Oracle model. Tags are removed and added respectively. ## QA steps 1. juju bootstrap oracle 2. juju deploy cs:~axwalk/storagetest --storage fs=oracle,1G 3. juju remove-storage --no-destroy fs/0 (wait, check it's still in console) 4. juju import-filesystem oracle \<volume-id\> fs (should be imported as fs/1) 5. juju attach-storage storagetest/0 fs/1 (wait, should attach correctly) 6. juju destroy-controller -y oracle --destroy-all-models --destroy-storage ## Documentation changes None. ## Bug reference None.
ObviouslyGreen · Aug 31, 2017 · c0fa0bb · c0fa0bb
2 parents 792de65 + 08c0fe1
commit c0fa0bb
Show file tree

Hide file tree

Showing 5 changed files with 297 additions and 165 deletions.
diff --git a/provider/oracle/environ_test.go b/provider/oracle/environ_test.go
@@ -68,7 +68,7 @@ func (e *environSuite) TestInstanceAvailabilityZoneNamesWithErrors(c *gc.C) {
 		environs.OpenParams{
 			Config: testing.ModelConfig(c),
 		},
-		oracletesting.FakeEnvironAPI{
+		&oracletesting.FakeEnvironAPI{
 			FakeInstancer: oracletesting.FakeInstancer{
 				InstanceErr: errors.New("FakeInstanceErr"),
 			},
@@ -86,7 +86,7 @@ func (e *environSuite) TestInstanceAvailabilityZoneNamesWithErrors(c *gc.C) {
 		environs.OpenParams{
 			Config: testing.ModelConfig(c),
 		},
-		oracletesting.FakeEnvironAPI{
+		&oracletesting.FakeEnvironAPI{
 			FakeInstance: oracletesting.FakeInstance{
 				AllErr: errors.New("FakeInstanceErr"),
 			},
@@ -115,7 +115,7 @@ func (e *environSuite) TestPrepareForBootstrapWithErrors(c *gc.C) {
 		environs.OpenParams{
 			Config: testing.ModelConfig(c),
 		},
-		oracletesting.FakeEnvironAPI{
+		&oracletesting.FakeEnvironAPI{
 			FakeAuthenticater: oracletesting.FakeAuthenticater{
 				AuthenticateErr: errors.New("FakeAuthenticateErr"),
 			},
@@ -180,7 +180,7 @@ func (e *environSuite) TestCreateWithErrors(c *gc.C) {
 		environs.OpenParams{
 			Config: testing.ModelConfig(c),
 		},
-		oracletesting.FakeEnvironAPI{
+		&oracletesting.FakeEnvironAPI{
 			FakeAuthenticater: oracletesting.FakeAuthenticater{
 				AuthenticateErr: errors.New("FakeAuthenticateErr"),
 			},

diff --git a/provider/oracle/images_test.go b/provider/oracle/images_test.go
@@ -29,7 +29,7 @@ func (i imageSuite) TestGetImageNameWithErrors(c *gc.C) {
 	_, err := oracle.GetImageName(oracletesting.DefaultEnvironAPI, "")
 	c.Assert(err, gc.NotNil)
 
-	_, err = oracle.GetImageName(oracletesting.FakeEnvironAPI{
+	_, err = oracle.GetImageName(&oracletesting.FakeEnvironAPI{
 		FakeImager: oracletesting.FakeImager{
 			AllErr: errors.New("FakeImageListErr"),
 		}}, "0")
@@ -44,7 +44,7 @@ func (i imageSuite) TestCheckImageList(c *gc.C) {
 }
 
 func (i imageSuite) TestCheckImageListWithErrors(c *gc.C) {
-	_, err := oracle.CheckImageList(oracletesting.FakeEnvironAPI{
+	_, err := oracle.CheckImageList(&oracletesting.FakeEnvironAPI{
 		FakeImager: oracletesting.FakeImager{
 			AllErr: errors.New("FakeImageListErr"),
 		},