openstack/openstacksdk
Code Issues Proposed changes

Avoid dogpile.cache 0.7.0

Browse Source 
Latest release of dogpile.cache breaks our method of calling a bound
function in the decorators.  For more details see story or

  https://github.com/sqlalchemy/dogpile.cache/issues/140

Pin while we work on a solution.

Additionally, the cirros version was updated to 0.3.6 in devsatck with
Id2f20ebafdd78c2dadf81b8f80f22e7bd6db7755.  Update the hard-coded
versions in the functional tests (this should be modified to be more
version agnostic in a future change)

Story: 2004605
Depends-On: https://review.openstack.org/624697
Change-Id: Id2df8a05ef45041bf55a2671f7d06e7b88cc79d6
This commit is contained in:
David Shrewsbury
2018-12-11 15:25:34 -05:00
committed by Morgan Fainberg
parent 46cbbfd372
commit fd61b54679
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/connect.py
View File

@@ -47,7 +47,7 @@ def _get_resource_value(resource_key, default):
SERVER_NAME = 'openstacksdk-example' SERVER_NAME = 'openstacksdk-example'
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.5-x86_64-disk') IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small') FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')
NETWORK_NAME = _get_resource_value('network_name', 'private') NETWORK_NAME = _get_resource_value('network_name', 'private')
KEYPAIR_NAME = _get_resource_value('keypair_name', 'openstacksdk-example') KEYPAIR_NAME = _get_resource_value('keypair_name', 'openstacksdk-example')

2
openstack/tests/functional/base.py
View File

@@ -39,7 +39,7 @@ def _disable_keep_alive(conn):
sess.keep_alive = False sess.keep_alive = False
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.5-x86_64-disk') IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small') FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')

38
openstack/tests/functional/cloud/test_clustering.py
View File

@@ -116,7 +116,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -146,7 +146,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -190,7 +190,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -233,7 +233,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -319,7 +319,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -393,7 +393,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -475,7 +475,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -568,7 +568,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -657,7 +657,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -714,7 +714,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -776,7 +776,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -864,7 +864,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -915,7 +915,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1019,7 +1019,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1057,7 +1057,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1095,7 +1095,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1131,7 +1131,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1298,7 +1298,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"
@@ -1357,7 +1357,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = { spec = {
"properties": { "properties": {
"flavor": "m1.tiny", "flavor": "m1.tiny",
"image": "cirros-0.3.5-x86_64-disk", "image": "cirros-0.3.6-x86_64-disk",
"networks": [ "networks": [
{ {
"network": "private" "network": "private"

2
requirements.txt
View File

@@ -18,5 +18,5 @@ futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
iso8601>=0.1.11 # MIT iso8601>=0.1.11 # MIT
netifaces>=0.10.4 # MIT netifaces>=0.10.4 # MIT
dogpile.cache>=0.6.2 # BSD dogpile.cache>=0.6.2,<0.7.0 # BSD
cryptography>=2.1 # BSD/Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0