openstack/puppet-neutron
Code Issues Proposed changes

neutron_router: Fix detection of tenant_id

Browse Source 
This change fixes the wrong key used to pick up tenant_id, which was
introduced by 75ca125cfa .

Change-Id: Icb0d67a70f940182c69e3a877e69425f75f98135
This commit is contained in:
Takashi Kajinami
2022-02-12 23:13:09 +09:00
parent 958cfd7aa3
commit 2ef08f70b1
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/puppet/provider/neutron_router/openstack.rb
View File

@@ -41,7 +41,7 @@ Puppet::Type.type(:neutron_router).provide(
:status => router[:status],
:distributed => router[:distributed],
:ha => router[:ha],
:tenant_id => router[:tenant_id],
:tenant_id => router[:project_id],
:availability_zone_hint => parse_availability_zone_hint(router[:availability_zone_hints])
)
end
@@ -123,7 +123,7 @@ Puppet::Type.type(:neutron_router).provide(
:status => router[:status],
:distributed => router[:distributed],
:ha => router[:ha],
:tenant_id => router[:tenant_id],
:tenant_id => router[:project_id],
:availability_zone_hint => self.class.parse_availability_zone_hint(router[:availability_zone_hints])
}
end

2
spec/unit/provider/neutron_router/openstack_spec.rb
View File

@@ -51,7 +51,6 @@ ha="True"
id="d73f453a-77ca-4843-977a-3af0fda8dfcb"
name="router1"
project_id="60f9544eb94c42a6b7e8e98c2be981b1"
project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="ACTIVE"')
provider.create
expect(provider.exists?).to be_truthy
@@ -327,7 +326,6 @@ ha="False"
id="c3e93a5b-45ee-4029-b3a3-3331cb3e3f2a"
name="router2"
project_id="60f9544eb94c42a6b7e8e98c2be981b1"
project_id="60f9544eb94c42a6b7e8e98c2be981b1"
status="DOWN"')
instances = provider_class.instances