gophercloud
diff --git a/‎openstack/compute/v2/servers/results.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/results.go
+4Lines changed: 4 additions & 0 deletions b/‎openstack/compute/v2/servers/results.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/results.go
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎openstack/compute/v2/servers/testing/fixtures_test.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/testing/fixtures_test.go
+5-2Lines changed: 5 additions & 2 deletions b/‎openstack/compute/v2/servers/testing/fixtures_test.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/testing/fixtures_test.go
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/‎openstack/compute/v2/servers/testing/requests_test.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/testing/requests_test.go
+2Lines changed: 2 additions & 0 deletions b/‎openstack/compute/v2/servers/testing/requests_test.go
Copy file name to clipboardExpand all lines: openstack/compute/v2/servers/testing/requests_test.go
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎openstack/objectstorage/v1/containers/results.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/results.go
+2Lines changed: 2 additions & 0 deletions b/‎openstack/objectstorage/v1/containers/results.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/results.go
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎openstack/objectstorage/v1/containers/testing/fixtures.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/testing/fixtures.go
+2Lines changed: 2 additions & 0 deletions b/‎openstack/objectstorage/v1/containers/testing/fixtures.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/testing/fixtures.go
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎openstack/objectstorage/v1/containers/testing/requests_test.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/testing/requests_test.go
+2Lines changed: 2 additions & 0 deletions b/‎openstack/objectstorage/v1/containers/testing/requests_test.go
Copy file name to clipboardExpand all lines: openstack/objectstorage/v1/containers/testing/requests_test.go
+2Lines changed: 2 additions & 0 deletions
@@ -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 {
 
@@ -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"
 
@@ -775,6 +775,7 @@ func TestGetFaultyServer(t *testing.T) {
 
 	FaultyServer := ServerDerp
 	FaultyServer.Fault = DerpFault
+	FaultyServer.Locked = nil
 	th.CheckDeepEquals(t, FaultyServer, *actual)
 }
 
@@ -1146,6 +1147,7 @@ func TestCreateServerWithTags(t *testing.T) {
 	tags := []string{"foo", "bar"}
 	ServerDerpTags := ServerDerp
 	ServerDerpTags.Tags = &tags
+	ServerDerpTags.Locked = nil
 
 	createOpts := servers.CreateOpts{
 		Name:      "derp",
 
@@ -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 {
 
@@ -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)
 	})
 }
@@ -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
@@ -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 {`