← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/juju-core/mpv-another-interface-update into lp:~maas-maintainers/juju-core/maas-provider-skeleton

 

Jeroen T. Vermeulen has proposed merging lp:~jtv/juju-core/mpv-another-interface-update into lp:~maas-maintainers/juju-core/maas-provider-skeleton.

Commit message:
Also add EnvironProvider.InstanceId.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~jtv/juju-core/mpv-another-interface-update/+merge/152131

This method was apparently _also_ added to the EnvironProvider interface while we were implementing, but the errors about the other addition were hiding the problem.


Jeroen
-- 
https://code.launchpad.net/~jtv/juju-core/mpv-another-interface-update/+merge/152131
Your team MAAS Maintainers is requested to review the proposed merge of lp:~jtv/juju-core/mpv-another-interface-update into lp:~maas-maintainers/juju-core/maas-provider-skeleton.
=== modified file 'environs/maas/environprovider.go'
--- environs/maas/environprovider.go	2013-03-07 08:21:07 +0000
+++ environs/maas/environprovider.go	2013-03-07 09:29:22 +0000
@@ -4,6 +4,7 @@
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/log"
+	"launchpad.net/juju-core/state"
 )
 
 type maasEnvironProvider struct{}
@@ -40,3 +41,8 @@
 func (*maasEnvironProvider) PrivateAddress() (string, error) {
 	panic("Not implemented.")
 }
+
+// InstanceId is specified in the EnvironProvider interface.
+func (*maasEnvironProvider) InstanceId() (state.InstanceId, error) {
+	panic("Not implemented.")
+}