mcloud

Merge lp://staging/~gary-wzl77/mcloud/job_uuid into lp://staging/mcloud/devel

  1. job_uuid
  2. Merge into devel
Proposed by Gary.Wang
Status: Merged
Approved by: Zhang Enwei
Approved revision: 60
Merged at revision: 16
Proposed branch: lp://staging/~gary-wzl77/mcloud/job_uuid
Merge into: lp://staging/mcloud/devel
Diff against target: 8284 lines (+2819/-2895)
52 files modified
CMakeLists.txt (+1/-1)
debian/VERSION (+1/-1)
debian/VERSION.vivid (+1/-1)
debian/changelog (+13/-2)
debian/control (+2/-0)
debian/control.in (+2/-0)
debian/libmcloud0.install (+0/-3)
debian/libmcloud1.install (+0/-3)
debian/libmcloud2.install (+3/-0)
include/mcloud/api/client.h (+32/-34)
include/mcloud/api/cloudcontent.h (+18/-18)
include/mcloud/api/cloudfolder.h (+14/-14)
include/mcloud/api/cloudresource.h (+13/-13)
include/mcloud/api/diskinfo.h (+7/-6)
include/mcloud/api/downloadtask.h (+16/-19)
include/mcloud/api/exceptions.h (+49/-49)
include/mcloud/api/outlink.h (+9/-9)
include/mcloud/api/syncmanager.h (+12/-12)
include/mcloud/api/task.h (+10/-10)
include/mcloud/api/taskqueue.h (+11/-10)
include/mcloud/api/uploadtask.h (+18/-22)
provider/CMakeLists.txt (+2/-2)
provider/McloudProvider.cpp (+0/-666)
provider/McloudProvider.h (+0/-82)
provider/main.cpp (+10/-12)
provider/mcloudprovider.cpp (+648/-0)
provider/mcloudprovider.h (+82/-0)
src/mcloud/api/client.cpp (+45/-53)
src/mcloud/api/client_priv.cpp (+628/-632)
src/mcloud/api/client_priv.h (+63/-63)
src/mcloud/api/cloudcontent.cpp (+53/-50)
src/mcloud/api/cloudfolder.cpp (+40/-38)
src/mcloud/api/diskinfo.cpp (+8/-5)
src/mcloud/api/downloadtask.cpp (+10/-11)
src/mcloud/api/downloadtask_priv.cpp (+44/-44)
src/mcloud/api/downloadtask_priv.h (+28/-28)
src/mcloud/api/outlink.cpp (+11/-8)
src/mcloud/api/syncmanager.cpp (+10/-7)
src/mcloud/api/syncmanager_priv.cpp (+6/-10)
src/mcloud/api/syncmanager_priv.h (+10/-11)
src/mcloud/api/syncthread.cpp (+107/-116)
src/mcloud/api/syncthread.h (+3/-3)
src/mcloud/api/taskhandler.h (+32/-24)
src/mcloud/api/uploadtask.cpp (+10/-11)
src/mcloud/api/uploadtask_priv.cpp (+46/-46)
src/mcloud/api/uploadtask_priv.h (+33/-33)
tests/server/server.py (+1/-1)
tests/unit/mcloud-provider/CMakeLists.txt (+1/-1)
tests/unit/mcloud-provider/mcloud-provider-unit-tests.cpp (+133/-163)
tests/unit/mcloud/CMakeLists.txt (+0/-3)
tests/unit/mcloud/api/mcloud-rest-test.cpp (+217/-233)
tests/unit/mcloud/api/mcloud-sync-test.cpp (+306/-312)
To merge this branch: bzr merge lp://staging/~gary-wzl77/mcloud/job_uuid
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Zhang Enwei (community) Approve
Review via email: mp+308474@code.staging.launchpad.net

Commit message

1.generate job id with uuid.
2.reduce the size of temporary generated file.

Description of the change

1.generate job id with uuid.
2.reduce the size of temporary generated file.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:54
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/26/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/886
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/893
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/699/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/699
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/699/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/26/rebuild

review: Approve (continuous-integration)
lp://staging/~gary-wzl77/mcloud/job_uuid updated
55. By Gary.Wang

little printout fixed

56. By Gary.Wang

making code look better.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:56
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/27/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/888
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/895
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/701
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/701/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/27/rebuild

review: Approve (continuous-integration)
Revision history for this message
Zhang Enwei (zhangew401) wrote :

LGTM

review: Approve
lp://staging/~gary-wzl77/mcloud/job_uuid updated
57. By Gary.Wang

get rid of std::bind and use lamda.

58. By Gary.Wang

code formatting.

59. By Gary.Wang

1.more unique_ptr instead of shared_ptr
2.code formatting.

60. By Gary.Wang

1.add missing dependency(account-plugin-mcloud)
2.generate job upload id with uuid.

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:60
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/28/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/911
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/918
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/721/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/721
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/721/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/28/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: