Merge pull request #37 from UpCloudLtd/change-zone

Change zone from hel1 to hel2

Author: alienhaxor

README.md

@@ -112,7 +112,7 @@ Since the request for creating a new server is asynchronous, the server will rep
 ```go
 // Create the server
 serverDetails, err := svc.CreateServer(&request.CreateServerRequest{
-	Zone:             "fi-hel1",
+	Zone:             "fi-hel2",
 	Title:            "My new server",
 	Hostname:         "server.example.com",
 	PasswordDelivery: request.PasswordDeliveryNone,

upcloud/ip_address_test.go

@@ -14,7 +14,7 @@ func TestUnmarshalIPAddresses(t *testing.T) {
         <access>public</access>
         <address>2a04:3540:1000:310:6069:7bff:fe96:71d1</address>
         <family>IPv6</family>
-        <ptr_record>6069-7bff-fe96-71d1.v6.fi-hel1.host.upcloud.com</ptr_record>
+        <ptr_record>6069-7bff-fe96-71d1.v6.fi-hel2.host.upcloud.com</ptr_record>
         <server>0000acd1-06aa-4453-865c-fedb3f02a6a1</server>
     </ip_address>
     <ip_address>
@@ -29,7 +29,7 @@ func TestUnmarshalIPAddresses(t *testing.T) {
         <address>94.237.32.40</address>
         <family>IPv4</family>
         <part_of_plan>yes</part_of_plan>
-        <ptr_record>94-237-32-40.fi-hel1.host.upcloud.com</ptr_record>
+        <ptr_record>94-237-32-40.fi-hel2.host.upcloud.com</ptr_record>
         <server>0000acd1-06aa-4453-865c-fedb3f02a6a1</server>
     </ip_address>
 </ip_addresses>`
@@ -43,6 +43,6 @@ func TestUnmarshalIPAddresses(t *testing.T) {
 	assert.Equal(t, IPAddressAccessPublic, firstAddress.Access)
 	assert.Equal(t, "2a04:3540:1000:310:6069:7bff:fe96:71d1", firstAddress.Address)
 	assert.Equal(t, IPAddressFamilyIPv6, firstAddress.Family)
-	assert.Equal(t, "6069-7bff-fe96-71d1.v6.fi-hel1.host.upcloud.com", firstAddress.PTRRecord)
+	assert.Equal(t, "6069-7bff-fe96-71d1.v6.fi-hel2.host.upcloud.com", firstAddress.PTRRecord)
 	assert.Equal(t, "0000acd1-06aa-4453-865c-fedb3f02a6a1", firstAddress.ServerUUID)
 }

upcloud/price_test.go

@@ -114,7 +114,7 @@ func TestUmarshalPriceZones(t *testing.T) {
             <amount>1</amount>
             <price>0</price>
         </ipv6_address>
-        <name>fi-hel1</name>
+        <name>fi-hel2</name>
         <public_ipv4_bandwidth_in>
             <amount>1</amount>
             <price>0</price>

upcloud/request/server_test.go

@@ -20,7 +20,7 @@ func TestGetServerDetailsRequest(t *testing.T) {
 // TestCreateServerRequest tests that CreateServerRequest objects behave correctly
 func TestCreateServerRequest(t *testing.T) {
 	request := CreateServerRequest{
-		Zone:             "fi-hel1",
+		Zone:             "fi-hel2",
 		Title:            "Integration test server #1",
 		Hostname:         "debian.example.com",
 		PasswordDelivery: PasswordDeliveryNone,
@@ -56,7 +56,7 @@ func TestCreateServerRequest(t *testing.T) {
 		},
 	}
 
-	expectedXML := "<server><hostname>debian.example.com</hostname><ip_addresses><ip_address><access>private</access><family>IPv4</family></ip_address><ip_address><access>public</access><family>IPv4</family></ip_address><ip_address><access>public</access><family>IPv6</family></ip_address></ip_addresses><login_user><create_password>no</create_password><ssh_keys><ssh_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWf2MmpHweXCNUcW91PWZR5UqOkydBr1Gi1xDI16IW4JndMYkH9OF0sWvPz03kfY6NbcHY0bed1Q8BpAC//WfLltuvjrzk33IoFJZ2Ai+4fVdkevkf7pBeSvzdXSyKAT+suHrp/2Qu5hewIUdDCp+znkwyypIJ/C2hDphwbLR3QquOfn6KyKMPZC4my8dFvLxESI0UqeripaBHUGcvNG2LL563hXmWzUu/cyqCpg5IBzpj/ketg8m1KBO7U0dimIAczuxfHk3kp9bwOFquWA2vSFNuVkr8oavk36pHkU88qojYNEy/zUTINE0w6CE/EbDkQVDZEGgDtAkq4jL+4MPV negge@palinski</ssh_key><ssh_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJfx4OmD8D6mnPA0BPk2DVlbggEkMvB2cecSttauZuaYX7Vju6PvG+kXrUbTvO09oLQMoNYAk3RinqQLXo9eF7bzZIsgB4ZmKGau84kOpYjguhimkKtZiVTKF53G2pbnpiZUN9wfy3xK2mt/MkacjZ1Tp7lAgRGTfWDoTfQa88kzOJGNPWXd12HIvFtd/1KoS9vm5O0nDLV+5zSBLxEYNDmBlIGu1Y3XXle5ygL1BhfGvqOQnv/TdRZcrOgVGWHADvwEid91/+IycLNMc37uP7TdS6vOihFBMytfmFXAqt4+3AzYNmyc+R392RorFzobZ1UuEFm3gUod2Wvj8pY8d/ negge@palinski</ssh_key></ssh_keys></login_user><password_delivery>none</password_delivery><storage_devices><storage_device><action>clone</action><storage>01000000-0000-4000-8000-000030060200</storage><title>disk1</title><size>30</size><tier>maxiops</tier></storage_device></storage_devices><title>Integration test server #1</title><zone>fi-hel1</zone></server>"
+	expectedXML := "<server><hostname>debian.example.com</hostname><ip_addresses><ip_address><access>private</access><family>IPv4</family></ip_address><ip_address><access>public</access><family>IPv4</family></ip_address><ip_address><access>public</access><family>IPv6</family></ip_address></ip_addresses><login_user><create_password>no</create_password><ssh_keys><ssh_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWf2MmpHweXCNUcW91PWZR5UqOkydBr1Gi1xDI16IW4JndMYkH9OF0sWvPz03kfY6NbcHY0bed1Q8BpAC//WfLltuvjrzk33IoFJZ2Ai+4fVdkevkf7pBeSvzdXSyKAT+suHrp/2Qu5hewIUdDCp+znkwyypIJ/C2hDphwbLR3QquOfn6KyKMPZC4my8dFvLxESI0UqeripaBHUGcvNG2LL563hXmWzUu/cyqCpg5IBzpj/ketg8m1KBO7U0dimIAczuxfHk3kp9bwOFquWA2vSFNuVkr8oavk36pHkU88qojYNEy/zUTINE0w6CE/EbDkQVDZEGgDtAkq4jL+4MPV negge@palinski</ssh_key><ssh_key>ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJfx4OmD8D6mnPA0BPk2DVlbggEkMvB2cecSttauZuaYX7Vju6PvG+kXrUbTvO09oLQMoNYAk3RinqQLXo9eF7bzZIsgB4ZmKGau84kOpYjguhimkKtZiVTKF53G2pbnpiZUN9wfy3xK2mt/MkacjZ1Tp7lAgRGTfWDoTfQa88kzOJGNPWXd12HIvFtd/1KoS9vm5O0nDLV+5zSBLxEYNDmBlIGu1Y3XXle5ygL1BhfGvqOQnv/TdRZcrOgVGWHADvwEid91/+IycLNMc37uP7TdS6vOihFBMytfmFXAqt4+3AzYNmyc+R392RorFzobZ1UuEFm3gUod2Wvj8pY8d/ negge@palinski</ssh_key></ssh_keys></login_user><password_delivery>none</password_delivery><storage_devices><storage_device><action>clone</action><storage>01000000-0000-4000-8000-000030060200</storage><title>disk1</title><size>30</size><tier>maxiops</tier></storage_device></storage_devices><title>Integration test server #1</title><zone>fi-hel2</zone></server>"
 	actualXML, err := xml.Marshal(&request)
 	assert.Nil(t, err)
 	assert.Equal(t, expectedXML, string(actualXML))

upcloud/request/storage_test.go

@@ -37,15 +37,15 @@ func TestCreateStorageRequest(t *testing.T) {
 		Tier:  upcloud.StorageTierMaxIOPS,
 		Title: "Test storage",
 		Size:  10,
-		Zone:  "fi-hel1",
+		Zone:  "fi-hel2",
 		BackupRule: &upcloud.BackupRule{
 			Interval:  upcloud.BackupRuleIntervalDaily,
 			Time:      "0430",
 			Retention: 30,
 		},
 	}
 
-	expectedXML := "<storage><size>10</size><tier>maxiops</tier><title>Test storage</title><zone>fi-hel1</zone><backup_rule><interval>daily</interval><time>0430</time><retention>30</retention></backup_rule></storage>"
+	expectedXML := "<storage><size>10</size><tier>maxiops</tier><title>Test storage</title><zone>fi-hel2</zone><backup_rule><interval>daily</interval><time>0430</time><retention>30</retention></backup_rule></storage>"
 	actualXML, err := xml.Marshal(&request)
 	assert.Nil(t, err)
 	assert.Equal(t, expectedXML, string(actualXML))
@@ -110,11 +110,11 @@ func TestCloneStorageRequest(t *testing.T) {
 	request := CloneStorageRequest{
 		UUID:  "foo",
 		Title: "Cloned storage",
-		Zone:  "fi-hel1",
+		Zone:  "fi-hel2",
 		Tier:  upcloud.StorageTierMaxIOPS,
 	}
 
-	expectedXML := "<storage><zone>fi-hel1</zone><tier>maxiops</tier><title>Cloned storage</title></storage>"
+	expectedXML := "<storage><zone>fi-hel2</zone><tier>maxiops</tier><title>Cloned storage</title></storage>"
 	actualXML, err := xml.Marshal(&request)
 	assert.Nil(t, err)
 	assert.Equal(t, expectedXML, string(actualXML))

upcloud/service/service_test.go

@@ -274,7 +274,7 @@ func TestCloneStorage(t *testing.T) {
 	clonedStorageDetails, err := svc.CloneStorage(&request.CloneStorageRequest{
 		UUID:  storageDetails.UUID,
 		Title: "Cloned storage",
-		Zone:  "fi-hel1",
+		Zone:  "fi-hel2",
 		Tier:  upcloud.StorageTierMaxIOPS,
 	})
 
@@ -607,7 +607,7 @@ func createServer(name string) *upcloud.ServerDetails {
 	hostname := strings.ToLower(title + ".example.com")
 
 	createServerRequest := request.CreateServerRequest{
-		Zone:             "fi-hel1",
+		Zone:             "fi-hel2",
 		Title:            title,
 		Hostname:         hostname,
 		PasswordDelivery: request.PasswordDeliveryNone,
@@ -689,7 +689,7 @@ func createStorage() *upcloud.StorageDetails {
 		Tier:  upcloud.StorageTierMaxIOPS,
 		Title: "Test storage",
 		Size:  10,
-		Zone:  "fi-hel1",
+		Zone:  "fi-hel2",
 		BackupRule: &upcloud.BackupRule{
 			Interval:  upcloud.BackupRuleIntervalDaily,
 			Time:      "0430",

upcloud/zone_test.go

@@ -15,8 +15,8 @@ func TestUnmarshalZones(t *testing.T) {
         <id>de-fra1</id>
     </zone>
     <zone>
-        <description>Helsinki #1</description>
-        <id>fi-hel1</id>
+        <description>Helsinki #2</description>
+        <id>fi-hel2</id>
     </zone>
     <zone>
         <description>London #1</description>