Merge pull request #3273 from gophercloud/bp-v2-4d5dc13-cec507c

pierreprinetti · web-flow · commit b5aa339bfbfe · 2024-12-18T16:59:32.000+01:00
[v2] Add missing fields in Objectstorage and compute API
diff --git a/openstack/compute/v2/servers/results.go b/openstack/compute/v2/servers/results.go
@@ -279,6 +279,10 @@ type Server struct {
 
 	// AvailabilityZone is the availabilty zone the server is in.
 	AvailabilityZone string `json:"OS-EXT-AZ:availability_zone"`
+
+	// Locked indicates the lock status of the server
+	// This requires microversion 2.9 or later
+	Locked *bool `json:"locked"`
 }
 
 type AttachedVolume struct {
diff --git a/openstack/compute/v2/servers/testing/fixtures_test.go b/openstack/compute/v2/servers/testing/fixtures_test.go
@@ -158,7 +158,8 @@ const ServerListBody = `
 			"progress": 0,
 			"OS-EXT-STS:power_state": 1,
 			"config_drive": "",
-			"metadata": {}
+			"metadata": {},
+			"locked": true
 		},
 		{
 		"status": "ACTIVE",
@@ -297,7 +298,8 @@ const SingleServerBody = `
 		"progress": 0,
 		"OS-EXT-STS:power_state": 1,
 		"config_drive": "",
-		"metadata": {}
+		"metadata": {},
+		"locked": true
 	}
 }
 `
@@ -631,6 +633,7 @@ var (
 		TerminatedAt:       time.Time{},
 		DiskConfig:         servers.Manual,
 		AvailabilityZone:   "nova",
+		Locked:             func() *bool { b := true; return &b }(),
 	}
 
 	ConsoleOutput = "abc"
diff --git a/openstack/compute/v2/servers/testing/requests_test.go b/openstack/compute/v2/servers/testing/requests_test.go
@@ -774,6 +774,7 @@ func TestGetFaultyServer(t *testing.T) {
 
 	FaultyServer := ServerDerp
 	FaultyServer.Fault = DerpFault
+	FaultyServer.Locked = nil
 	th.CheckDeepEquals(t, FaultyServer, *actual)
 }
 
@@ -1145,6 +1146,7 @@ func TestCreateServerWithTags(t *testing.T) {
 	tags := []string{"foo", "bar"}
 	ServerDerpTags := ServerDerp
 	ServerDerpTags.Tags = &tags
+	ServerDerpTags.Locked = nil
 
 	createOpts := servers.CreateOpts{
 		Name:      "derp",
diff --git a/openstack/objectstorage/v1/containers/results.go b/openstack/objectstorage/v1/containers/results.go
@@ -111,6 +111,8 @@ type GetHeader struct {
 	TempURLKey2      string    `json:"X-Container-Meta-Temp-URL-Key-2"`
 	Timestamp        float64   `json:"X-Timestamp,string"`
 	VersionsEnabled  bool      `json:"-"`
+	SyncKey          string    `json:"X-Sync-Key"`
+	SyncTo           string    `json:"X-Sync-To"`
 }
 
 func (r *GetHeader) UnmarshalJSON(b []byte) error {
diff --git a/openstack/objectstorage/v1/containers/testing/fixtures.go b/openstack/objectstorage/v1/containers/testing/fixtures.go
@@ -258,6 +258,8 @@ func HandleGetContainerSuccessfully(t *testing.T, options ...option) {
 		w.Header().Set("X-Trans-Id", "tx554ed59667a64c61866f1-0057b4ba37")
 		w.Header().Set("X-Storage-Policy", "test_policy")
 		w.Header().Set("X-Versions-Enabled", "True")
+		w.Header().Set("X-Sync-Key", "272465181849")
+		w.Header().Set("X-Sync-To", "anotherContainer")
 		w.WriteHeader(http.StatusNoContent)
 	})
 }
diff --git a/openstack/objectstorage/v1/containers/testing/requests_test.go b/openstack/objectstorage/v1/containers/testing/requests_test.go
@@ -244,6 +244,8 @@ func TestGetContainer(t *testing.T) {
 		StoragePolicy:   "test_policy",
 		Timestamp:       1471298837.95721,
 		VersionsEnabled: true,
+		SyncKey:         "272465181849",
+		SyncTo:          "anotherContainer",
 	}
 	actual, err := res.Extract()
 	th.AssertNoErr(t, err)

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,10 @@ type Server struct {`
`279`	`279`
`280`	`280`	`// AvailabilityZone is the availabilty zone the server is in.`
`281`	`281`	AvailabilityZone string `json:"OS-EXT-AZ:availability_zone"`
	`282`	`+`
	`283`	`+ // Locked indicates the lock status of the server`
	`284`	`+ // This requires microversion 2.9 or later`
	`285`	+ Locked *bool `json:"locked"`
`282`	`286`	`}`
`283`	`287`
`284`	`288`	`type AttachedVolume struct {`
Original file line number	Diff line number	Diff line change
@@ -158,7 +158,8 @@ const ServerListBody = `
`158`	`158`	`"progress": 0,`
`159`	`159`	`"OS-EXT-STS:power_state": 1,`
`160`	`160`	`"config_drive": "",`
`161`		`- "metadata": {}`
	`161`	`+ "metadata": {},`
	`162`	`+ "locked": true`
`162`	`163`	`},`
`163`	`164`	`{`
`164`	`165`	`"status": "ACTIVE",`
@@ -297,7 +298,8 @@ const SingleServerBody = `
`297`	`298`	`"progress": 0,`
`298`	`299`	`"OS-EXT-STS:power_state": 1,`
`299`	`300`	`"config_drive": "",`
`300`		`- "metadata": {}`
	`301`	`+ "metadata": {},`
	`302`	`+ "locked": true`
`301`	`303`	`}`
`302`	`304`	`}`
`303`	`305`	`
`@@ -631,6 +633,7 @@ var (`
`631`	`633`	`TerminatedAt: time.Time{},`
`632`	`634`	`DiskConfig: servers.Manual,`
`633`	`635`	`AvailabilityZone: "nova",`
	`636`	`+ Locked: func() *bool { b := true; return &b }(),`
`634`	`637`	`}`
`635`	`638`
`636`	`639`	`ConsoleOutput = "abc"`
Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ type GetHeader struct {`
`111`	`111`	TempURLKey2 string `json:"X-Container-Meta-Temp-URL-Key-2"`
`112`	`112`	Timestamp float64 `json:"X-Timestamp,string"`
`113`	`113`	VersionsEnabled bool `json:"-"`
	`114`	+ SyncKey string `json:"X-Sync-Key"`
	`115`	+ SyncTo string `json:"X-Sync-To"`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`func (r *GetHeader) UnmarshalJSON(b []byte) error {`
Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,8 @@ func HandleGetContainerSuccessfully(t *testing.T, options ...option) {`
`258`	`258`	`w.Header().Set("X-Trans-Id", "tx554ed59667a64c61866f1-0057b4ba37")`
`259`	`259`	`w.Header().Set("X-Storage-Policy", "test_policy")`
`260`	`260`	`w.Header().Set("X-Versions-Enabled", "True")`
	`261`	`+ w.Header().Set("X-Sync-Key", "272465181849")`
	`262`	`+ w.Header().Set("X-Sync-To", "anotherContainer")`
`261`	`263`	`w.WriteHeader(http.StatusNoContent)`
`262`	`264`	`})`
`263`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,8 @@ func TestGetContainer(t *testing.T) {`
`244`	`244`	`StoragePolicy: "test_policy",`
`245`	`245`	`Timestamp: 1471298837.95721,`
`246`	`246`	`VersionsEnabled: true,`
	`247`	`+ SyncKey: "272465181849",`
	`248`	`+ SyncTo: "anotherContainer",`
`247`	`249`	`}`
`248`	`250`	`actual, err := res.Extract()`
`249`	`251`	`th.AssertNoErr(t, err)`