Fix section of s3_url and ec2_url

The options are used in ec2api-tempest-plugin [1] and based on their usage
in the plugin they should be under [aws] section, not [boto] one.

[1] https://opendev.org/openstack/ec2api-tempest-plugin

Story: 2006906
Task: 37548

Change-Id: I6f787e140162bafce0eca85ebf96b0bfc5f48903
This commit is contained in:
Martin Kopec 2019-11-19 08:56:41 +00:00
parent 62955a4cf3
commit 83a7c2e85f
3 changed files with 11 additions and 6 deletions

View File

@ -19,7 +19,7 @@ from config_tempest.services.base import Service
class Ec2Service(Service):
def set_default_tempest_options(self, conf):
conf.set('boto', 'ec2_url', self.service_url)
conf.set('aws', 'ec2_url', self.service_url)
@staticmethod
def get_service_name():
@ -29,7 +29,7 @@ class Ec2Service(Service):
class S3Service(Service):
def set_default_tempest_options(self, conf):
conf.set('boto', 's3_url', self.service_url)
conf.set('aws', 's3_url', self.service_url)
@staticmethod
def get_service_name():

View File

@ -15,8 +15,8 @@
import mock
from config_tempest.services.boto import Ec2Service
from config_tempest.services.boto import S3Service
from config_tempest.services.aws import Ec2Service
from config_tempest.services.aws import S3Service
from config_tempest.services.services import Services
from config_tempest.tests.base import BaseConfigTempestTest
@ -37,7 +37,7 @@ class TestEc2Service(BaseConfigTempestTest):
def test_set_default_tempest_options(self):
service = Ec2Service("ec2", "ec2", self.FAKE_URL, self.clients, False)
service.set_default_tempest_options(self.Services._conf)
ec2_url = self.Services._conf.get("boto", "ec2_url")
ec2_url = self.Services._conf.get("aws", "ec2_url")
self.assertEqual(ec2_url, self.FAKE_URL)
@ -57,5 +57,5 @@ class TestS3Service(BaseConfigTempestTest):
def test_set_default_tempest_options(self):
service = S3Service("s3", "s3", self.FAKE_URL, self.clients, False)
service.set_default_tempest_options(self.Services._conf)
ec2_url = self.Services._conf.get("boto", "s3_url")
ec2_url = self.Services._conf.get("aws", "s3_url")
self.assertEqual(ec2_url, self.FAKE_URL)

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Rename boto section to aws one for ec2_url and s3_url options used by
ec2api-tempest-plugin.