Reset the task state after backup done.
Reset the task state after backup done.

The compute manager needs to reset the task state after a backup
is complete. However it was only correctly reseting after a
snapshot due to the current expected state being hardcoded.
Now looks for the correct expected state depending on whether a
backup or snapshot was being executed.

Fixes bug 1051069

Change-Id: Ie91f7745b98232370be6c99d318a8033a93cc50c

phenoxim/nova,yatinkumbhare/openstack-nova,maheshp/novatest,NeCTAR-RC/nova,raildo/nova,yatinkumbhare/openstack-nova,maelnor/nova,savi-dev/nova,shahar-stratoscale/nova,shootstar/novatest,isyippee/nova,maelnor/nova,akash1808/nova,imsplitbit/nova,gooddata/openstack-nova,barnsnake351/nova,NewpTone/stacklab-nova,rajalokan/nova,zhimin711/nova,berrange/nova,bigswitch/nova,gooddata/openstack-nova,tianweizhang/nova,badock/nova,usc-isi/nova,vladikr/nova_drafts,vladikr/nova_drafts,vmturbo/nova,savi-dev/nova,tangfeixiong/nova,SUSE-Cloud/nova,Tehsmash/nova,ewindisch/nova,belmiromoreira/nova,mikalstill/nova,aristanetworks/arista-ovs-nova,qwefi/nova,mmnelemane/nova,gooddata/openstack-nova,hanlind/nova,sebrandon1/nova,zzicewind/nova,double12gzh/nova,ntt-sic/nova,citrix-openstack-build/nova,akash1808/nova,cyx1231st/nova,rahulunair/nova,mgagne/nova,luogangyi/bcec-nova,silenceli/nova,devendermishrajio/nova_test_latest,j-carpentier/nova,gspilio/nova,cyx1231st/nova,rahulunair/nova,Triv90/Nova,thomasem/nova,yosshy/nova,tudorvio/nova,bclau/nova,jeffrey4l/nova,jianghuaw/nova,Yusuke1987/openstack_template,luogangyi/bcec-nova,felixma/nova,maoy/zknova,cloudbau/nova,NewpTone/stacklab-nova,devendermishrajio/nova,JianyuWang/nova,petrutlucian94/nova_dev,alexandrucoman/vbox-nova-driver,maheshp/novatest,belmiromoreira/nova,Brocade-OpenSource/OpenStack-DNRM-Nova,cernops/nova,sridevikoushik31/openstack,alaski/nova,adelina-t/nova,blueboxgroup/nova,BeyondTheClouds/nova,orbitfp7/nova,klmitch/nova,apporc/nova,fnordahl/nova,bigswitch/nova,takeshineshiro/nova,gspilio/nova,TwinkleChawla/nova,kimjaejoong/nova,Metaswitch/calico-nova,sridevikoushik31/nova,cloudbase/nova-virtualbox,rickerc/nova_audit,JioCloud/nova_test_latest,jianghuaw/nova,hanlind/nova,double12gzh/nova,rajalokan/nova,bclau/nova,yosshy/nova,qwefi/nova,cloudbase/nova,affo/nova,bgxavier/nova,sacharya/nova,akash1808/nova_test_latest,paulmathews/nova,viggates/nova,shootstar/novatest,tianweizhang/nova,scripnichenko/nova,tudorvio/nova,whitepages/nova,rajalokan/nova,thomasem/nova,watonyweng/nova,maheshp/novatest,tangfeixiong/nova,eonpatapon/nova,orbitfp7/nova,mandeepdhami/nova,paulmathews/nova,petrutlucian94/nova,leilihh/novaha,rahulunair/nova,isyippee/nova,takeshineshiro/nova,houshengbo/nova_vmware_compute_driver,varunarya10/nova_test_latest,rajalokan/nova,Francis-Liu/animated-broccoli,yrobla/nova,leilihh/novaha,Juniper/nova,dims/nova,fajoy/nova,iuliat/nova,rrader/nova-docker-plugin,viggates/nova,zaina/nova,CiscoSystems/nova,kimjaejoong/nova,aristanetworks/arista-ovs-nova,shail2810/nova,DirectXMan12/nova-hacking,cernops/nova,eharney/nova,plumgrid/plumgrid-nova,Yusuke1987/openstack_template,zhimin711/nova,Metaswitch/calico-nova,saleemjaveds/https-github.com-openstack-nova,scripnichenko/nova,eharney/nova,dstroppa/openstack-smartos-nova-grizzly,CEG-FYP-OpenStack/scheduler,alvarolopez/nova,berrange/nova,akash1808/nova_test_latest,fajoy/nova,devoid/nova,DirectXMan12/nova-hacking,joker946/nova,imsplitbit/nova,vmturbo/nova,rickerc/nova_audit,dawnpower/nova,ruslanloman/nova,raildo/nova,Juniper/nova,savi-dev/nova,redhat-openstack/nova,angdraug/nova,citrix-openstack-build/nova,eayunstack/nova,JioCloud/nova,NewpTone/stacklab-nova,plumgrid/plumgrid-nova,vmturbo/nova,shahar-stratoscale/nova,ted-gould/nova,dstroppa/openstack-smartos-nova-grizzly,zzicewind/nova,TieWei/nova,ewindisch/nova,Stavitsky/nova,sebrandon1/nova,dawnpower/nova,devendermishrajio/nova_test_latest,vmturbo/nova,silenceli/nova,tanglei528/nova,paulmathews/nova,alaski/nova,aristanetworks/arista-ovs-nova,Stavitsky/nova,adelina-t/nova,jianghuaw/nova,CloudServer/nova,LoHChina/nova,zaina/nova,noironetworks/nova,Juniper/nova,bgxavier/nova,devoid/nova,houshengbo/nova_vmware_compute_driver,Triv90/Nova,CloudServer/nova,sridevikoushik31/nova,Yuriy-Leonov/nova,Triv90/Nova,usc-isi/nova,houshengbo/nova_vmware_compute_driver,mahak/nova,CCI-MOC/nova,blueboxgroup/nova,sridevikoushik31/nova,ntt-sic/nova,BeyondTheClouds/nova,watonyweng/nova,saleemjaveds/https-github.com-openstack-nova,LoHChina/nova,sebrandon1/nova,OpenAcademy-OpenStack/nova-scheduler,dstroppa/openstack-smartos-nova-grizzly,MountainWei/nova,alexandrucoman/vbox-nova-driver,shail2810/nova,klmitch/nova,cloudbau/nova,apporc/nova,openstack/nova,OpenAcademy-OpenStack/nova-scheduler,JianyuWang/nova,ted-gould/nova,DirectXMan12/nova-hacking,cernops/nova,sridevikoushik31/nova,TwinkleChawla/nova,angdraug/nova,Francis-Liu/animated-broccoli,leilihh/nova,joker946/nova,fnordahl/nova,openstack/nova,MountainWei/nova,felixma/nova,jianghuaw/nova,gspilio/nova,cloudbase/nova-virtualbox,CiscoSystems/nova,affo/nova,TieWei/nova,dims/nova,eayunstack/nova,jeffrey4l/nova,badock/nova,sridevikoushik31/openstack,virtualopensystems/nova,virtualopensystems/nova,projectcalico/calico-nova,tealover/nova,redhat-openstack/nova,SUSE-Cloud/nova,Tehsmash/nova,spring-week-topos/nova-week,usc-isi/nova,petrutlucian94/nova_dev,maoy/zknova,Brocade-OpenSource/OpenStack-DNRM-Nova,nikesh-mahalka/nova,maoy/zknova,varunarya10/nova_test_latest,j-carpentier/nova,fajoy/nova,mmnelemane/nova,spring-week-topos/nova-week,sridevikoushik31/openstack,rrader/nova-docker-plugin,edulramirez/nova,devendermishrajio/nova,CEG-FYP-OpenStack/scheduler,NeCTAR-RC/nova,eonpatapon/nova,tealover/nova,CCI-MOC/nova,klmitch/nova,leilihh/nova,BeyondTheClouds/nova,nikesh-mahalka/nova,yrobla/nova,ruslanloman/nova,mandeepdhami/nova,Juniper/nova,phenoxim/nova,JioCloud/nova,alvarolopez/nova,hanlind/nova,petrutlucian94/nova,sacharya/nova,cloudbase/nova,Yuriy-Leonov/nova,mgagne/nova,openstack/nova,mikalstill/nova,mikalstill/nova,barnsnake351/nova,mahak/nova,edulramirez/nova,tanglei528/nova,whitepages/nova,JioCloud/nova_test_latest,klmitch/nova,mahak/nova,projectcalico/calico-nova,noironetworks/nova,cloudbase/nova,yrobla/nova,iuliat/nova,gooddata/openstack-nova