Skip to content

Commit

Permalink
Add options object to all route jsons in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
hoffmaen committed Dec 2, 2024
1 parent d017f70 commit 2d147b8
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
7 changes: 2 additions & 5 deletions lib/cloud_controller/app_manifest/manifest_route.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@ def self.parse(route, options=nil)
end

attrs[:full_route] = route

if options
attrs[:options] = {}
attrs[:options][:lb_algo] = options[:'loadbalancing-algorithm'] if options.key?(:'loadbalancing-algorithm')
end
attrs[:options] = {}
attrs[:options][:lb_algo] = options[:'loadbalancing-algorithm'] if options && options.key?(:'loadbalancing-algorithm')

ManifestRoute.new(attrs)
end
Expand Down
30 changes: 20 additions & 10 deletions spec/request/routes_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -1267,7 +1268,8 @@
metadata: {
labels: { potato: 'yam' },
annotations: { style: 'mashed' }
}
},
options: {}
}
end

Expand Down Expand Up @@ -1299,7 +1301,8 @@
metadata: {
labels: { potato: 'yam' },
annotations: { style: 'mashed' }
}
},
options: {}
}
end

Expand Down Expand Up @@ -1384,7 +1387,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -1482,7 +1486,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -1555,7 +1560,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -1642,7 +1648,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -1782,7 +1789,8 @@
space: { href: %r{#{Regexp.escape(link_prefix)}/v3/spaces/#{space.guid}} },
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{UUID_REGEX}/destinations} },
domain: { href: %r{#{Regexp.escape(link_prefix)}/v3/domains/#{domain.guid}} }
}
},
options: {}
}
end

Expand Down Expand Up @@ -1894,7 +1902,8 @@
metadata: {
labels: {},
annotations: {}
}
},
options: {}
}
end

Expand Down Expand Up @@ -2127,7 +2136,8 @@
space: { href: %r{#{Regexp.escape(link_prefix)}/v3/spaces/#{space.guid}} },
destinations: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{UUID_REGEX}/destinations} },
domain: { href: %r{#{Regexp.escape(link_prefix)}/v3/domains/#{domain.guid}} }
}
},
options: {}
}
end

Expand Down

0 comments on commit 2d147b8

Please sign in to comment.