Skip to content

Commit

Permalink
Remove OpenVZ references in test-files
Browse files Browse the repository at this point in the history
  • Loading branch information
norrland committed Apr 5, 2024
1 parent 985c317 commit 4929657
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions networkadapters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@ func TestNetworkAdapterIsReady(t *testing.T) {
func TestNetworkAdaptersCreate(t *testing.T) {
c := &mockClient{body: `{ "response": { "networkadapter":
{ "adaptertype": "E1000", "bandwidth": 10, "name": "Network Adapter 2", "networkid": "mynetwork",
"networkadapterid": "ab12cd34-dcba-0123-abcd-abc123456789", "serverid": "vz123456" }}}`}
"networkadapterid": "ab12cd34-dcba-0123-abcd-abc123456789", "serverid": "wps123456" }}}`}
n := NetworkAdapterService{client: c}

params := CreateNetworkAdapterParams{
Bandwidth: 10,
NetworkID: "mynetwork",
ServerID: "vz123456",
ServerID: "wps123456",
}

networkadapter, _ := n.Create(context.Background(), params)

assert.Equal(t, "POST", c.lastMethod, "method is used correct")
assert.Equal(t, "networkadapter/create", c.lastPath, "path used is correct")
assert.Equal(t, "vz123456", networkadapter.ServerID, "networkadapter ServerID is correct")
assert.Equal(t, "wps123456", networkadapter.ServerID, "networkadapter ServerID is correct")
assert.Equal(t, "Network Adapter 2", networkadapter.Name, "networkadapter Name is correct")
assert.Equal(t, "mynetwork", networkadapter.NetworkID, "networkadapter Description is correct")
}
Expand All @@ -63,7 +63,7 @@ func TestNetworkAdaptersDetails(t *testing.T) {
"name": "My Network Adapter",
"adaptertype": "VMXNET 3",
"state": "ready",
"serverid": "vz123456",
"serverid": "wps123456",
"networkid": "internet-fbg"
} } }`}
s := NetworkAdapterService{client: c}
Expand All @@ -77,14 +77,14 @@ func TestNetworkAdaptersDetails(t *testing.T) {
assert.Equal(t, "9ac61694-eb4d-4011-9d10-c395ba5f7269", networkAdapter.ID, "network adapter Bandwidth is correct")
assert.Equal(t, "My Network Adapter", networkAdapter.Name, "network adapter Bandwidth is correct")
assert.Equal(t, "internet-fbg", networkAdapter.NetworkID, "network adapter Bandwidth is correct")
assert.Equal(t, "vz123456", networkAdapter.ServerID, "network adapter Bandwidth is correct")
assert.Equal(t, "wps123456", networkAdapter.ServerID, "network adapter Bandwidth is correct")
assert.Equal(t, "ready", networkAdapter.State, "network adapter Bandwidth is correct")
}

func TestNetworkAdaptersEdit(t *testing.T) {
c := &mockClient{body: `{ "response": { "networkadapter":
{ "adaptertype": "E1000", "bandwidth": 100, "name": "Network Adapter 2", "networkid": "mynewnetwork",
"networkadapterid": "ab12cd34-dcba-0123-abcd-abc123456789", "serverid": "vz123456" }}}`}
"networkadapterid": "ab12cd34-dcba-0123-abcd-abc123456789", "serverid": "wps123456" }}}`}
n := NetworkAdapterService{client: c}

params := EditNetworkAdapterParams{
Expand Down
16 changes: 8 additions & 8 deletions servers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,14 @@ func TestCreateServerParamsWithUsers(t *testing.T) {
}

func TestServersCreate(t *testing.T) {
c := &mockClient{body: `{ "response": { "server": { "serverid": "vz12345" } } }`}
c := &mockClient{body: `{ "response": { "server": { "serverid": "kvm12345" } } }`}
s := ServerService{client: c}

server, _ := s.Create(context.Background(), CreateServerParams{})

assert.Equal(t, "POST", c.lastMethod, "method used is correct")
assert.Equal(t, "server/create", c.lastPath, "path used is correct")
assert.Equal(t, "vz12345", server.ID, "server ID is correct")
assert.Equal(t, "kvm12345", server.ID, "server ID is correct")
}

func TestServersConsole(t *testing.T) {
Expand Down Expand Up @@ -150,7 +150,7 @@ func TestServersDestroy(t *testing.T) {
c := &mockClient{}
s := ServerService{client: c}

s.Destroy(context.Background(), "vz123456", DestroyServerParams{})
s.Destroy(context.Background(), "kvm123456", DestroyServerParams{})

assert.Equal(t, "POST", c.lastMethod, "method used is correct")
assert.Equal(t, "server/destroy", c.lastPath, "path used is correct")
Expand Down Expand Up @@ -182,28 +182,28 @@ func TestServersEdit(t *testing.T) {
c := &mockClient{}
s := ServerService{client: c}

s.Edit(context.Background(), "vz123456", EditServerParams{})
s.Edit(context.Background(), "kvm123456", EditServerParams{})

assert.Equal(t, "POST", c.lastMethod, "method used is correct")
assert.Equal(t, "server/edit", c.lastPath, "path used is correct")
}

func TestServersList(t *testing.T) {
c := &mockClient{body: `{ "response": { "servers": [{ "serverid": "vz12345" }] } }`}
c := &mockClient{body: `{ "response": { "servers": [{ "serverid": "kvm12345" }] } }`}
s := ServerService{client: c}

servers, _ := s.List(context.Background())

assert.Equal(t, "GET", c.lastMethod, "method used is correct")
assert.Equal(t, "server/list", c.lastPath, "path used is correct")
assert.Equal(t, "vz12345", (*servers)[0].ID, "one server was returned")
assert.Equal(t, "kvm12345", (*servers)[0].ID, "one server was returned")
}

func TestServersStart(t *testing.T) {
c := &mockClient{}
s := ServerService{client: c}

s.Start(context.Background(), "vz123456")
s.Start(context.Background(), "kvm123456")

assert.Equal(t, "POST", c.lastMethod, "method used is correct")
assert.Equal(t, "server/start", c.lastPath, "path used is correct")
Expand All @@ -213,7 +213,7 @@ func TestServersStop(t *testing.T) {
c := &mockClient{}
s := ServerService{client: c}

s.Stop(context.Background(), "vz123456", StopServerParams{})
s.Stop(context.Background(), "kvm123456", StopServerParams{})

assert.Equal(t, "POST", c.lastMethod, "method used is correct")
assert.Equal(t, "server/stop", c.lastPath, "path used is correct")
Expand Down

0 comments on commit 4929657

Please sign in to comment.