openstack
/
openstacksdk
Code Issues Proposed changes

Update cirros version for functional tests 

Devstack has updated from 0.3.6 to 0.4.0, since we still hardcode
things, we need to follow them.

[0] https://review.openstack.org/521825

Change-Id: I5ed1bb70f6f14f79a31b7c98eedfbe2956044036
This commit is contained in:
Jens Harbott 2019-01-22 11:14:48 +00:00
parent 6a77be01bf
commit 601769e838
3 changed files with 21 additions and 21 deletions
Show Stats 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'
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.4.0-x86_64-disk')
FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')
NETWORK_NAME = _get_resource_value('network_name', 'private')
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
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.4.0-x86_64-disk')
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 = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -146,7 +146,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -190,7 +190,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -233,7 +233,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -319,7 +319,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -393,7 +393,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -475,7 +475,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -568,7 +568,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -657,7 +657,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -714,7 +714,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -776,7 +776,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -864,7 +864,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -915,7 +915,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1019,7 +1019,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1057,7 +1057,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1095,7 +1095,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1131,7 +1131,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1298,7 +1298,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"
@ -1357,7 +1357,7 @@ class TestClustering(base.BaseFunctionalTest):
spec = {
"properties": {
"flavor": "m1.tiny",
"image": "cirros-0.3.6-x86_64-disk",
"image": "cirros-0.4.0-x86_64-disk",
"networks": [
{
"network": "private"