Merge "Update replication property in capabilities"

2016-12-26 11:24:04 +00:00
parent 25a8c6c752 36735e244a
commit ffb5eef8c8
2 changed files with 2 additions and 2 deletions
--- a/cinder/tests/unit/test_volume.py
+++ b/cinder/tests/unit/test_volume.py
@@ -4526,7 +4526,7 @@ class VolumeTestCase(base.BaseVolumeTestCase):
                'title': 'QoS',
                'description': 'Enables QoS.',
                'type': 'boolean'},
-            'replication': {
+            'replication_enabled': {
                'title': 'Replication',
                'description': 'Enables replication.',
                'type': 'boolean'},
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -625,7 +625,7 @@ class BaseVD(object):

        self._set_property(
            properties,
-            "replication",
+            "replication_enabled",
            "Replication",
            _("Enables replication."),
            "boolean")