Update semantic_version to 2.8.2 and remove multiattach in volume template
Change-Id: I7fedbcf85ee9c4dbacf1fc50cec25380c3b3e93d
This commit is contained in:
parent
f0e022dc13
commit
0ce2ad12d0
|
@ -123,7 +123,7 @@ requests==2.14.2
|
|||
requestsexceptions==1.4.0
|
||||
rfc3986==1.1.0
|
||||
Routes==2.3.1
|
||||
semantic-version==2.3.1
|
||||
semantic-version==2.8.2
|
||||
simplejson==3.13.2
|
||||
six==1.10.0
|
||||
smmap2==2.0.3
|
||||
|
|
|
@ -35,10 +35,6 @@ Properties:
|
|||
Contract: $.bool().notNull()
|
||||
Default: false
|
||||
|
||||
multiattach:
|
||||
Contract: $.bool().notNull()
|
||||
Default: false
|
||||
|
||||
sourceImage:
|
||||
Contract: $.string()
|
||||
|
||||
|
@ -81,11 +77,6 @@ Methods:
|
|||
Then:
|
||||
$properties.source_volid: $.sourceVolume.openstackId
|
||||
|
||||
# Available only since Heat 6.0.0 (Mitaka)
|
||||
- If: $.multiattach
|
||||
Then:
|
||||
$properties.multiattach: $.multiattach
|
||||
|
||||
# Available only since Heat 5.0.0 (Liberty)
|
||||
- If: $.readOnly
|
||||
Then:
|
||||
|
|
|
@ -383,7 +383,7 @@ class TestParseVersionSpec(base.MuranoTestCase):
|
|||
|
||||
def test_empty_version_spec(self):
|
||||
version_spec = ""
|
||||
expected = semantic_version.Spec('>=0.0.0', '<1.0.0-0')
|
||||
expected = semantic_version.Spec('>=0.0.0', '<1.0.0')
|
||||
self.check(expected, version_spec)
|
||||
|
||||
def test_empty_kind(self):
|
||||
|
@ -403,7 +403,7 @@ class TestParseVersionSpec(base.MuranoTestCase):
|
|||
|
||||
def test_remove_spaces(self):
|
||||
version_spec = "< = 2 .1"
|
||||
expected = semantic_version.Spec('<2.2.0-0')
|
||||
expected = semantic_version.Spec('<2.2.0')
|
||||
self.check(expected, version_spec)
|
||||
|
||||
def test_input_version(self):
|
||||
|
@ -413,5 +413,5 @@ class TestParseVersionSpec(base.MuranoTestCase):
|
|||
|
||||
def test_input_spec(self):
|
||||
version_spec = semantic_version.Spec('<=1', '<=1.11')
|
||||
expected = semantic_version.Spec('<1.12.0-0', '<2.0.0-0')
|
||||
expected = semantic_version.Spec('<1.12.0', '<2.0.0')
|
||||
self.check(expected, version_spec)
|
||||
|
|
|
@ -32,7 +32,7 @@ class TestVersioning(test_case.DslTestCase):
|
|||
|
||||
def test_empty_provided_version(self):
|
||||
version = ''
|
||||
sem_version = semantic_version.Spec('>=0.0.0', '<1.0.0-0')
|
||||
sem_version = semantic_version.Spec('>=0.0.0', '<1.0.0')
|
||||
model = om.Object('Empty', class_version=version)
|
||||
m = mock.MagicMock(return_value=self._package_loader._package)
|
||||
self._package_loader.load_class_package = m
|
||||
|
@ -41,7 +41,7 @@ class TestVersioning(test_case.DslTestCase):
|
|||
|
||||
def test_several_in_row(self):
|
||||
version = '>3.0.0,<=4.1'
|
||||
sem_version = semantic_version.Spec('>3.0.0', '<4.2.0-0')
|
||||
sem_version = semantic_version.Spec('>3.0.0', '<4.2.0')
|
||||
model = om.Object('Empty', class_version=version)
|
||||
m = mock.MagicMock(return_value=self._package_loader._package)
|
||||
self._package_loader.load_class_package = m
|
||||
|
|
|
@ -200,6 +200,8 @@ class TestPackageCache(base.MuranoTestCase):
|
|||
package = mock.MagicMock()
|
||||
package.fully_qualified_name = fqn
|
||||
package.classes = ['test_class_1', 'test_class_2']
|
||||
test_version = semantic_version.Version('1.1.0')
|
||||
package.version = test_version
|
||||
self.loader.register_package(package)
|
||||
|
||||
spec = semantic_version.Spec('*')
|
||||
|
|
|
@ -47,5 +47,5 @@ oslo.utils>=3.33.0 # Apache-2.0
|
|||
oslo.i18n>=3.15.3 # Apache-2.0
|
||||
oslo.log>=3.36.0 # Apache-2.0
|
||||
oslo.upgradecheck>=0.1.0 # Apache-2.0
|
||||
semantic-version>=2.3.1 # BSD
|
||||
semantic-version>=2.8.2 # BSD
|
||||
castellan>=0.16.0 # Apache-2.0
|
||||
|
|
Loading…
Reference in New Issue