← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/juju/export_test.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/juju/export_test.go
1
1
package juju
2
2
 
3
 
import (
4
 
        "github.com/juju/juju/api"
5
 
        "github.com/juju/juju/environs/configstore"
6
 
        "github.com/juju/juju/jujuclient"
7
 
)
 
3
import "github.com/juju/juju/api"
8
4
 
9
5
var (
10
6
        ProviderConnectDelay   = &providerConnectDelay
11
 
        GetBootstrapConfig     = getBootstrapConfig
12
 
        MaybePreferIPv6        = &maybePreferIPv6
13
7
        ResolveOrDropHostnames = &resolveOrDropHostnames
14
8
        ServerAddress          = &serverAddress
15
9
)
16
10
 
17
 
func NewAPIFromStore(controllerName, accountName, modelName string, store configstore.Storage, controllerStore jujuclient.ClientStore, f api.OpenFunc) (api.Connection, error) {
18
 
        return newAPIFromStore(controllerName, accountName, modelName, store, controllerStore, f, nil)
 
11
func NewAPIFromStore(args NewAPIConnectionParams, open api.OpenFunc) (api.Connection, error) {
 
12
        return newAPIFromStore(args, open)
19
13
}