openstack
/
horizon
Code Issues Proposed changes

Merge "Fixes Resource id mapping with Heat Resources"

This commit is contained in:
Jenkins 2015-02-12 11:40:29 +00:00 committed by Gerrit Code Review
parent 6f4ebe21bd dabfe0ab92
commit 6269b0dd08
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack_dashboard/dashboards/project/stacks/mappings.py
View File

@ -28,10 +28,14 @@ LOG = logging.getLogger(__name__)
resource_urls = {
"AWS::EC2::Instance": {
'link': 'horizon:project:instances:detail'},
"AWS::EC2::InternetGateway": {
'link': 'horizon:project:networks:ports:detail'},
"AWS::EC2::NetworkInterface": {
'link': 'horizon:project:networks:ports:detail'},
"AWS::EC2::RouteTable": {
'link': 'horizon:project:routers:detail'},
"AWS::EC2::SecurityGroup": {
'link': 'horizon:project:access_and_security:index'},
"AWS::EC2::Subnet": {
'link': 'horizon:project:networks:subnets:detail'},
"AWS::EC2::Volume": {
@ -40,8 +44,6 @@ resource_urls = {
'link': 'horizon:project:networks:detail'},
"AWS::S3::Bucket": {
'link': 'horizon:project:containers:index'},
"OS::Nova::Server": {
'link': 'horizon:project:instances:detail'},
"OS::Cinder::Volume": {
'link': 'horizon:project:volumes:volumes:detail'},
"OS::Neutron::Net": {
@ -52,6 +54,10 @@ resource_urls = {
'link': 'horizon:project:routers:detail'},
"OS::Neutron::Subnet": {
'link': 'horizon:project:networks:subnets:detail'},
"OS::Nova::KeyPair": {
'link': 'horizon:project:access_and_security:index'},
"OS::Nova::Server": {
'link': 'horizon:project:instances:detail'},
"OS::Swift::Container": {
'link': 'horizon:project:containers:index',
'format_pattern': '%s' + swift.FOLDER_DELIMITER},

4
openstack_dashboard/dashboards/project/stacks/tests.py
View File

@ -77,6 +77,10 @@ class MappingsTests(test.TestCase):
None,
'Foo::Bar::Baz',
'aaa')
assertMappingUrl(
'/project/instances/aaa/',
'OS::Nova::Server',
'aaa')
def test_stack_output(self):
self.assertEqual(u'foo', mappings.stack_output('foo'))