launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/juju-core/use-last-gomaasapi into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

Commit message:
Fix the MAAS provider so that it can cope with the last version of gomaasapi.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~rvb/juju-core/use-last-gomaasapi/+merge/147958

This is using lp:~rvb/gomaasapi/fix-fallout/+merge/147957
-- 
https://code.launchpad.net/~rvb/juju-core/use-last-gomaasapi/+merge/147958
Your team MAAS Maintainers is requested to review the proposed merge of lp:~rvb/juju-core/use-last-gomaasapi into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

=== modified file 'environs/maas/environ.go'
--- environs/maas/environ.go	2013-02-08 11:03:56 +0000
+++ environs/maas/environ.go	2013-02-12 15:23:21 +0000
@@ -18,7 +18,7 @@
 	ecfgMutex sync.Mutex
 
 	ecfgUnlocked       *maasEnvironConfig
-	maasClientUnlocked gomaasapi.MAASObject
+	maasClientUnlocked *gomaasapi.MAASObject
 }
 
 var _ environs.Environ = (*maasEnviron)(nil)

=== modified file 'environs/maas/maas_test.go'
--- environs/maas/maas_test.go	2013-02-07 08:29:56 +0000
+++ environs/maas/maas_test.go	2013-02-12 15:23:21 +0000
@@ -20,7 +20,7 @@
 func (s *ProviderSuite) SetUpSuite(c *C) {
 	TestMAASObject := gomaasapi.NewTestMAAS("1.0")
 	s.testMAASObject = TestMAASObject
-	s.environ = &maasEnviron{name: "test env", maasClientUnlocked: TestMAASObject}
+	s.environ = &maasEnviron{name: "test env", maasClientUnlocked: &TestMAASObject.MAASObject}
 }
 
 func (s *ProviderSuite) TearDownTest(c *C) {