HP 3PAR: Extra-specs snap_cpg is ignored if there is no extra-specs cpg

[Mark Sturdevant]

When using a volume-type with snap_cpg in extra-specs, if cpg is not in the volume-type extra-specs, then the extra-specs snap_cpg is ignored (it can only come from the config file).

If snap_cpg is in the volume-type extra-specs, then that should always be used for snapCPG even if the cpg setting came from elsewhere.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/125142

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/125142
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=a1fa72b9e02973c064136c1f723d2af2558e578b
Submitter: Jenkins
Branch: master

commit a1fa72b9e02973c064136c1f723d2af2558e578b
Author: Mark Sturdevant <email address hidden>
Date: Fri Sep 12 23:48:16 2014 -0700

    HP 3PAR: Don't ignore extra-specs snap_cpg when missing cpg

    When snap_cpg is specified in extra-specs, it should be used.
    For some reason, it was being ignored when extra-specs did not
    also specify a user cpg.

    When using a volume-type, the snapCPG should come from (in this order
    of preference):
    1. extra specs snap_cpg,
    2. extra specs cpg,
    3. config hp3par_cpg_snap,
    4. config hp3par_cpg.

    Change-Id: I649e3dc49f7775a8071229fc315f0ee5f23aa833
    Closes-Bug: 1368972