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

Jump to bottom

Map tcp,udp to udp,tcp during migration. (#6827) #6855

Merged
merged 2 commits into from
Apr 2, 2019
Merged

Map tcp,udp to udp,tcp during migration. (#6827) #6855

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6427bdb
Map `tcp,udp` to `udp,tcp` during migration. (#6827)
jeschkies Mar 27, 2019
c318814
Test fix.
jeschkies Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/scala/mesosphere/marathon/raml/NetworkConversion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ trait NetworkConversion {
}

implicit val protocolWrites: Writes[String, NetworkProtocol] = Writes { protocol =>
NetworkProtocol.fromString(protocol).getOrElse(throw new IllegalStateException(s"unsupported protocol $protocol"))
// Regression MARATHON-8575
if (protocol == "tcp,udp") {
NetworkProtocol.UdpTcp
} else {
NetworkProtocol.fromString(protocol).getOrElse(throw new IllegalStateException(s"unsupported protocol $protocol"))
}
}

implicit val portDefinitionWrites: Writes[state.PortDefinition, PortDefinition] = Writes { port =>
Expand Down