Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JUJU-163]create openstack FIPs on networks on AZ to match the server's addresses. #13478

Merged
merged 9 commits into from
Nov 9, 2021
Merged

[JUJU-163]create openstack FIPs on networks on AZ to match the server's addresses. #13478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0829220
Add ProviderNetworkId value to makeSubnetInfo results.
hmlanigan May 25, 2021
6f9ee09
Update how to choose network in AllocatePublicIP.
hmlanigan May 25, 2021
a001e73
Add interfaces to faciliate mock testing of Networking.
hmlanigan May 26, 2021
edeba30
Mock unit tests for AllocatePublicIP.
hmlanigan May 26, 2021
dde31bc
Base FIPs on network AZ for server addresses rather than server AZ.
hmlanigan Nov 4, 2021
3fad2fd
Update goose sha.
hmlanigan Nov 5, 2021
2919547
go fmt -s
hmlanigan Nov 5, 2021
a78ae26
go mod tidy
hmlanigan Nov 8, 2021
c898a37
Add log message.
hmlanigan Nov 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ require (
github.com/docker/distribution v2.7.1+incompatible
github.com/dustin/go-humanize v1.0.0
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3 // indirect
github.com/go-goose/goose/v4 v4.0.0-20210629133523-eda372ae25db
github.com/go-goose/goose/v4 v4.0.0-20211105130700-d0015d23b748
github.com/go-logr/logr v0.2.0
github.com/go-macaroon-bakery/macaroon-bakery/v3 v3.0.0-20210309064400-d73aa8f92aa2
github.com/golang/mock v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-goose/goose/v4 v4.0.0-20210629133523-eda372ae25db h1:PAls+Pq90HA7UpJb0jGeGTubW0muNZZIwUHQ6EclLo8=
github.com/go-goose/goose/v4 v4.0.0-20210629133523-eda372ae25db/go.mod h1:mG53mYAOc5+rfKK7FndJFcBgwMYnsa+P3ihgrpM63XI=
github.com/go-goose/goose/v4 v4.0.0-20211105130700-d0015d23b748 h1:rZ91MPawwZX2h8Dc0R3rxo114T5Zoa4spLg1RTf4xiE=
github.com/go-goose/goose/v4 v4.0.0-20211105130700-d0015d23b748/go.mod h1:mG53mYAOc5+rfKK7FndJFcBgwMYnsa+P3ihgrpM63XI=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
Expand Down
2 changes: 2 additions & 0 deletions provider/openstack/local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,7 @@ func (s *localServerSuite) TestSubnetsFindAll(c *gc.C) {
expectedSubnetMap[network.Id(subnet.Id)] = network.SubnetInfo{
CIDR: subnet.Cidr,
ProviderId: network.Id(subnet.Id),
ProviderNetworkId: network.Id(subnet.NetworkId),
VLANTag: 0,
AvailabilityZones: net.AvailabilityZones,
ProviderSpaceId: "",
Expand Down Expand Up @@ -1448,6 +1449,7 @@ func (s *localServerSuite) TestSubnetsFindAllWithExternal(c *gc.C) {
expectedSubnetMap[network.Id(subnets.Id)] = network.SubnetInfo{
CIDR: subnets.Cidr,
ProviderId: network.Id(subnets.Id),
ProviderNetworkId: network.Id(subnets.NetworkId),
VLANTag: 0,
AvailabilityZones: net.AvailabilityZones,
ProviderSpaceId: "",
Expand Down
342 changes: 341 additions & 1 deletion provider/openstack/network_mock_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading