Acc Compute v2: Updating secgroups tests

acceptance/openstack/compute/v2/secgroup_test.go

@@ -101,28 +101,44 @@ func TestSecGroupsAddGroupToServer(t *testing.T) {
 	th.AssertNoErr(t, err)
 	defer DeleteSecurityGroupRule(t, client, rule.ID)
 
-	server, err := CreateServer(t, client)
-	if err != nil {
-		t.Fatalf("Unable to create server: %v", err)
-	}
+	server, err = CreateServer(t, client)
+	th.AssertNoErr(t, err)
 	defer DeleteServer(t, client, server)
 
 	t.Logf("Adding group %s to server %s", securityGroup.ID, server.ID)
 	err = secgroups.AddServer(client, server.ID, securityGroup.Name).ExtractErr()
-	if err != nil {
-		t.Fatalf("Unable to add group %s to server %s: %s", securityGroup.ID, server.ID, err)
-	}
+	th.AssertNoErr(t, err)
 
 	server, err = servers.Get(client, server.ID).Extract()
-	if err != nil {
-		t.Fatalf("Unable to get server %s: %s", server.ID, err)
-	}
+	th.AssertNoErr(t, err)
 
 	tools.PrintResource(t, server)
 
+	var found bool
+	for _, sg := range server.SecurityGroups {
+		if sg["name"] == securityGroup.Name {
+			found = true
+		}
+	}
+
+	th.AssertEquals(t, found, true)
+
 	t.Logf("Removing group %s from server %s", securityGroup.ID, server.ID)
 	err = secgroups.RemoveServer(client, server.ID, securityGroup.Name).ExtractErr()
-	if err != nil {
-		t.Fatalf("Unable to remove group %s from server %s: %s", securityGroup.ID, server.ID, err)
+	th.AssertNoErr(t, err)
+
+	server, err = servers.Get(client, server.ID).Extract()
+	th.AssertNoErr(t, err)
+
+	found = false
+
+	tools.PrintResource(t, server)
+
+	for _, sg := range server.SecurityGroups {
+		if sg["name"] == securityGroup.Name {
+			found = true
+		}
 	}
+
+	th.AssertEquals(t, found, false)
 }