Key Pairs Acceptance Test Cleanup
The following changes were made to the keypairs acceptance tests:
* Added build tags.
* Added List test.
* Added Create test.
* Added Import test.
* Cleaned up Server Create test.
* Printing all keypairs attributes.
diff --git a/acceptance/openstack/compute/v2/keypairs_test.go b/acceptance/openstack/compute/v2/keypairs_test.go
index 326c6f9..b9fb57a 100644
--- a/acceptance/openstack/compute/v2/keypairs_test.go
+++ b/acceptance/openstack/compute/v2/keypairs_test.go
@@ -1,4 +1,4 @@
-// +build acceptance
+// +build acceptance compute keypairs
package v2
@@ -7,68 +7,180 @@
"crypto/rsa"
"testing"
+ "github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/acceptance/tools"
"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
- th "github.com/gophercloud/gophercloud/testhelper"
"golang.org/x/crypto/ssh"
)
const keyName = "gophercloud_test_key_pair"
-func TestCreateServerWithKeyPair(t *testing.T) {
+func TestKeypairsList(t *testing.T) {
client, err := newClient()
- th.AssertNoErr(t, err)
+ if err != nil {
+ t.Fatalf("Unable to create a compute client: %v", err)
+ }
+ allPages, err := keypairs.List(client).AllPages()
+ if err != nil {
+ t.Fatalf("Unable to retrieve keypairs: %s", err)
+ }
+
+ allKeys, err := keypairs.ExtractKeyPairs(allPages)
+ if err != nil {
+ t.Fatalf("Unable to extract keypairs results: %s", err)
+ }
+
+ for _, keypair := range allKeys {
+ printKeyPair(t, &keypair)
+ }
+}
+
+func TestKeypairsCreate(t *testing.T) {
+ client, err := newClient()
+ if err != nil {
+ t.Fatalf("Unable to create a compute client: %v", err)
+ }
+
+ createOpts := keypairs.CreateOpts{
+ Name: keyName,
+ }
+ keyPair, err := keypairs.Create(client, createOpts).Extract()
+ if err != nil {
+ t.Fatalf("Unable to create keypair: %s", err)
+ }
+ defer deleteKeyPair(t, client, keyPair)
+
+ printKeyPair(t, keyPair)
+}
+
+func TestKeypairsImportPublicKey(t *testing.T) {
+ client, err := newClient()
+ if err != nil {
+ t.Fatalf("Unable to create a compute client: %v", err)
+ }
+
+ publicKey, err := createKey()
+ if err != nil {
+ t.Fatalf("Unable to create public key: %s", err)
+ }
+
+ createOpts := keypairs.CreateOpts{
+ Name: keyName,
+ PublicKey: publicKey,
+ }
+ keyPair, err := keypairs.Create(client, createOpts).Extract()
+ if err != nil {
+ t.Fatalf("Unable to create keypair: %s", err)
+ }
+ defer deleteKeyPair(t, client, keyPair)
+
+ printKeyPair(t, keyPair)
+}
+
+func TestKeypairsServerCreateWithKey(t *testing.T) {
if testing.Short() {
t.Skip("Skipping test that requires server creation in short mode.")
}
- privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
- publicKey := privateKey.PublicKey
- pub, err := ssh.NewPublicKey(&publicKey)
- th.AssertNoErr(t, err)
- pubBytes := ssh.MarshalAuthorizedKey(pub)
- pk := string(pubBytes)
-
- kp, err := keypairs.Create(client, keypairs.CreateOpts{
- Name: keyName,
- PublicKey: pk,
- }).Extract()
- th.AssertNoErr(t, err)
- t.Logf("Created key pair: %s\n", kp)
+ client, err := newClient()
+ if err != nil {
+ t.Fatalf("Unable to create a compute client: %v", err)
+ }
choices, err := ComputeChoicesFromEnv()
- th.AssertNoErr(t, err)
+ if err != nil {
+ t.Fatal(err)
+ }
- name := tools.RandomString("Gophercloud-", 8)
- t.Logf("Creating server [%s] with key pair.", name)
+ publicKey, err := createKey()
+ if err != nil {
+ t.Fatalf("Unable to create public key: %s", err)
+ }
+
+ createOpts := keypairs.CreateOpts{
+ Name: keyName,
+ PublicKey: publicKey,
+ }
+
+ keyPair, err := keypairs.Create(client, createOpts).Extract()
+ if err != nil {
+ t.Fatalf("Unable to create keypair: %s", err)
+ }
+ defer deleteKeyPair(t, client, keyPair)
+
+ networkID, err := getNetworkIDFromTenantNetworks(t, client, choices.NetworkName)
+ if err != nil {
+ t.Fatalf("Failed to obtain network ID: %v", err)
+ }
+
+ name := tools.RandomString("ACPTTEST", 16)
+ t.Logf("Attempting to create server: %s", name)
serverCreateOpts := servers.CreateOpts{
Name: name,
FlavorRef: choices.FlavorID,
ImageRef: choices.ImageID,
+ Networks: []servers.Network{
+ servers.Network{UUID: networkID},
+ },
}
server, err := servers.Create(client, keypairs.CreateOptsExt{
serverCreateOpts,
keyName,
}).Extract()
- th.AssertNoErr(t, err)
- defer servers.Delete(client, server.ID)
+ if err != nil {
+ t.Fatalf("Unable to create server: %s", err)
+ }
+
if err = waitForStatus(client, server, "ACTIVE"); err != nil {
t.Fatalf("Unable to wait for server: %v", err)
}
+ defer deleteServer(t, client, server)
server, err = servers.Get(client, server.ID).Extract()
- t.Logf("Created server: %+v\n", server)
- th.AssertNoErr(t, err)
- th.AssertEquals(t, server.KeyName, keyName)
+ if err != nil {
+ t.Fatalf("Unable to retrieve server: %s", err)
+ }
- t.Logf("Deleting key pair [%s]...", kp.Name)
- err = keypairs.Delete(client, keyName).ExtractErr()
- th.AssertNoErr(t, err)
+ if server.KeyName != keyName {
+ t.Fatalf("key name of server %s is %s, not %s", server.ID, server.KeyName, keyName)
+ }
+}
- t.Logf("Deleting server [%s]...", name)
+func createKey() (string, error) {
+ privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
+ if err != nil {
+ return "", err
+ }
+
+ publicKey := privateKey.PublicKey
+ pub, err := ssh.NewPublicKey(&publicKey)
+ if err != nil {
+ return "", err
+ }
+
+ pubBytes := ssh.MarshalAuthorizedKey(pub)
+ pk := string(pubBytes)
+ return pk, nil
+}
+
+func deleteKeyPair(t *testing.T, client *gophercloud.ServiceClient, keyPair *keypairs.KeyPair) {
+ err := keypairs.Delete(client, keyPair.Name).ExtractErr()
+ if err != nil {
+ t.Fatalf("Unable to delete keypair %s: %v", keyPair.Name, err)
+ }
+
+ t.Logf("Deleted keypair: %s", keyPair.Name)
+}
+
+func printKeyPair(t *testing.T, keypair *keypairs.KeyPair) {
+ t.Logf("Name: %s", keypair.Name)
+ t.Logf("Fingerprint: %s", keypair.Fingerprint)
+ t.Logf("Public Key: %s", keypair.PublicKey)
+ t.Logf("Private Key: %s", keypair.PrivateKey)
+ t.Logf("UserID: %s", keypair.UserID)
}