The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/4751
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Christian Brauner <[email protected]>
From ad91ca03164c5d9b7c758ceb0e88933eb8eff30d Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Fri, 6 Jul 2018 14:19:57 +0200 Subject: [PATCH 1/3] storage pools: move structs Signed-off-by: Christian Brauner <[email protected]> --- lxd/storage_pools.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lxd/storage_pools.go b/lxd/storage_pools.go index 81fb6141d..35a33a14b 100644 --- a/lxd/storage_pools.go +++ b/lxd/storage_pools.go @@ -21,6 +21,20 @@ import ( // Lock to prevent concurent storage pools creation var storagePoolCreateLock sync.Mutex +var storagePoolsCmd = Command{ + name: "storage-pools", + get: storagePoolsGet, + post: storagePoolsPost, +} + +var storagePoolCmd = Command{ + name: "storage-pools/{name}", + get: storagePoolGet, + put: storagePoolPut, + patch: storagePoolPatch, + delete: storagePoolDelete, +} + // /1.0/storage-pools // List all storage pools. func storagePoolsGet(d *Daemon, r *http.Request) Response { @@ -249,8 +263,6 @@ func storagePoolsPostCluster(d *Daemon, req api.StoragePoolsPost) error { return notifyErr } -var storagePoolsCmd = Command{name: "storage-pools", get: storagePoolsGet, post: storagePoolsPost} - // /1.0/storage-pools/{name} // Get a single storage pool. func storagePoolGet(d *Daemon, r *http.Request) Response { @@ -608,5 +620,3 @@ func storagePoolDeleteCheckPreconditions(cluster *db.Cluster, poolName string, p return nil } - -var storagePoolCmd = Command{name: "storage-pools/{name}", get: storagePoolGet, put: storagePoolPut, patch: storagePoolPatch, delete: storagePoolDelete} From 5e7ffb62a77358c069fa3310115de441db7513b9 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Fri, 6 Jul 2018 14:21:31 +0200 Subject: [PATCH 2/3] storage volumes: move structs Signed-off-by: Christian Brauner <[email protected]> --- lxd/storage_volumes.go | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/lxd/storage_volumes.go b/lxd/storage_volumes.go index 8d7ac4fc4..5f6e28420 100644 --- a/lxd/storage_volumes.go +++ b/lxd/storage_volumes.go @@ -21,6 +21,27 @@ import ( log "github.com/lxc/lxd/shared/log15" ) +var storagePoolVolumesCmd = Command{ + name: "storage-pools/{name}/volumes", + get: storagePoolVolumesGet, + post: storagePoolVolumesPost, +} + +var storagePoolVolumesTypeCmd = Command{ + name: "storage-pools/{name}/volumes/{type}", + get: storagePoolVolumesTypeGet, + post: storagePoolVolumesTypePost, +} + +var storagePoolVolumeTypeCmd = Command{ + name: "storage-pools/{pool}/volumes/{type}/{name:.*}", + post: storagePoolVolumeTypePost, + get: storagePoolVolumeTypeGet, + put: storagePoolVolumeTypePut, + patch: storagePoolVolumeTypePatch, + delete: storagePoolVolumeTypeDelete, +} + // /1.0/storage-pools/{name}/volumes // List all storage volumes attached to a given storage pool. func storagePoolVolumesGet(d *Daemon, r *http.Request) Response { @@ -67,8 +88,6 @@ func storagePoolVolumesGet(d *Daemon, r *http.Request) Response { return SyncResponse(true, volumes) } -var storagePoolVolumesCmd = Command{name: "storage-pools/{name}/volumes", get: storagePoolVolumesGet, post: storagePoolVolumesPost} - // /1.0/storage-pools/{name}/volumes/{type} // List all storage volumes of a given volume type for a given storage pool. func storagePoolVolumesTypeGet(d *Daemon, r *http.Request) Response { @@ -350,8 +369,6 @@ func doVolumeMigration(d *Daemon, poolName string, req *api.StorageVolumesPost) return OperationResponse(op) } -var storagePoolVolumesTypeCmd = Command{name: "storage-pools/{name}/volumes/{type}", get: storagePoolVolumesTypeGet, post: storagePoolVolumesTypePost} - // /1.0/storage-pools/{name}/volumes/{type}/{name} // Rename a storage volume of a given volume type in a given storage pool. func storagePoolVolumeTypePost(d *Daemon, r *http.Request) Response { @@ -829,5 +846,3 @@ func storagePoolVolumeTypeDelete(d *Daemon, r *http.Request) Response { return EmptySyncResponse } - -var storagePoolVolumeTypeCmd = Command{name: "storage-pools/{pool}/volumes/{type}/{name:.*}", post: storagePoolVolumeTypePost, get: storagePoolVolumeTypeGet, put: storagePoolVolumeTypePut, patch: storagePoolVolumeTypePatch, delete: storagePoolVolumeTypeDelete} From 84768bee368eeea853a2133cbf5d943c0c09683e Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Fri, 6 Jul 2018 14:24:23 +0200 Subject: [PATCH 3/3] images: move structs Signed-off-by: Christian Brauner <[email protected]> --- lxd/images.go | 60 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/lxd/images.go b/lxd/images.go index 0cc07ef2c..4ec5d4478 100644 --- a/lxd/images.go +++ b/lxd/images.go @@ -40,6 +40,54 @@ import ( log "github.com/lxc/lxd/shared/log15" ) +var imagesCmd = Command{ + name: "images", + post: imagesPost, + untrustedGet: true, + get: imagesGet, +} + +var imageCmd = Command{ + name: "images/{fingerprint}", + untrustedGet: true, + get: imageGet, + put: imagePut, + delete: imageDelete, + patch: imagePatch, +} + +var imagesExportCmd = Command{ + name: "images/{fingerprint}/export", + untrustedGet: true, + get: imageExport, +} + +var imagesSecretCmd = Command{ + name: "images/{fingerprint}/secret", + post: imageSecret, +} + +var imagesRefreshCmd = Command{ + name: "images/{fingerprint}/refresh", + post: imageRefresh, +} + +var aliasesCmd = Command{ + name: "images/aliases", + post: aliasesPost, + get: aliasesGet, +} + +var aliasCmd = Command{ + name: "images/aliases/{name:.*}", + untrustedGet: true, + get: aliasGet, + delete: aliasDelete, + put: aliasPut, + post: aliasPost, + patch: aliasPatch, +} + /* We only want a single publish running at any one time. The CPU and I/O load of publish is such that running multiple ones in parallel takes longer than running them serially. @@ -770,8 +818,6 @@ func imagesGet(d *Daemon, r *http.Request) Response { return SyncResponse(true, result) } -var imagesCmd = Command{name: "images", post: imagesPost, untrustedGet: true, get: imagesGet} - func autoUpdateImagesTask(d *Daemon) (task.Func, task.Schedule) { f := func(ctx context.Context) { autoUpdateImages(ctx, d) @@ -1309,8 +1355,6 @@ func imagePatch(d *Daemon, r *http.Request) Response { return EmptySyncResponse } -var imageCmd = Command{name: "images/{fingerprint}", untrustedGet: true, get: imageGet, put: imagePut, delete: imageDelete, patch: imagePatch} - func aliasesPost(d *Daemon, r *http.Request) Response { req := api.ImageAliasesPost{} if err := json.NewDecoder(r.Body).Decode(&req); err != nil { @@ -1697,11 +1741,3 @@ func imageRefresh(d *Daemon, r *http.Request) Response { return OperationResponse(op) } - -var imagesExportCmd = Command{name: "images/{fingerprint}/export", untrustedGet: true, get: imageExport} -var imagesSecretCmd = Command{name: "images/{fingerprint}/secret", post: imageSecret} -var imagesRefreshCmd = Command{name: "images/{fingerprint}/refresh", post: imageRefresh} - -var aliasesCmd = Command{name: "images/aliases", post: aliasesPost, get: aliasesGet} - -var aliasCmd = Command{name: "images/aliases/{name:.*}", untrustedGet: true, get: aliasGet, delete: aliasDelete, put: aliasPut, post: aliasPost, patch: aliasPatch}
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
