diff --git a/src/main/java/mesosphere/marathon/Protos.java b/src/main/java/mesosphere/marathon/Protos.java
index b5098f0ab57..9542447ba1c 100644
--- a/src/main/java/mesosphere/marathon/Protos.java
+++ b/src/main/java/mesosphere/marathon/Protos.java
@@ -152,6 +152,7 @@ public static final class Constraint extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Constraint)
ConstraintOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use Constraint.newBuilder() to construct.
private Constraint(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -184,8 +185,8 @@ private Constraint(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -291,6 +292,22 @@ public enum Operator
* MAX_PER = 5;
*/
MAX_PER(5),
+ /**
+ *
+ * Field must be the specified value
+ *
+ *
+ * IS = 6;
+ */
+ IS(6),
+ /**
+ *
+ * Field must be one of the specified values
+ *
+ *
+ * IN = 7;
+ */
+ IN(7),
;
/**
@@ -342,6 +359,22 @@ public enum Operator
* MAX_PER = 5;
*/
public static final int MAX_PER_VALUE = 5;
+ /**
+ *
+ * Field must be the specified value
+ *
+ *
+ * IS = 6;
+ */
+ public static final int IS_VALUE = 6;
+ /**
+ *
+ * Field must be one of the specified values
+ *
+ *
+ * IN = 7;
+ */
+ public static final int IN_VALUE = 7;
public final int getNumber() {
@@ -364,6 +397,8 @@ public static Operator forNumber(int value) {
case 3: return GROUP_BY;
case 4: return UNLIKE;
case 5: return MAX_PER;
+ case 6: return IS;
+ case 7: return IN;
default: return null;
}
}
@@ -566,7 +601,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -796,7 +830,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -809,12 +843,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -1268,6 +1302,7 @@ public static final class HealthCheckDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.HealthCheckDefinition)
HealthCheckDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use HealthCheckDefinition.newBuilder() to construct.
private HealthCheckDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -1308,8 +1343,8 @@ private HealthCheckDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -1932,7 +1967,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -2307,7 +2341,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -2320,12 +2354,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -3175,6 +3209,7 @@ public static final class ReadinessCheckDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ReadinessCheckDefinition)
ReadinessCheckDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ReadinessCheckDefinition.newBuilder() to construct.
private ReadinessCheckDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -3212,8 +3247,8 @@ private ReadinessCheckDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -3693,7 +3728,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -3999,7 +4033,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -4012,12 +4046,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -4655,6 +4689,7 @@ public static final class ObsoleteIpAddress extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ObsoleteIpAddress)
ObsoleteIpAddressOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ObsoleteIpAddress.newBuilder() to construct.
private ObsoleteIpAddress(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -4687,8 +4722,8 @@ private ObsoleteIpAddress(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -4956,7 +4991,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -5220,7 +5254,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -5233,12 +5267,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -5948,6 +5982,7 @@ public static final class ObsoleteDiscoveryInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ObsoleteDiscoveryInfo)
ObsoleteDiscoveryInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ObsoleteDiscoveryInfo.newBuilder() to construct.
private ObsoleteDiscoveryInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -5978,8 +6013,8 @@ private ObsoleteDiscoveryInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -6093,7 +6128,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -6303,7 +6337,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -6316,12 +6350,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -6772,6 +6806,7 @@ public static final class NetworkDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.NetworkDefinition)
NetworkDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use NetworkDefinition.newBuilder() to construct.
private NetworkDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -6804,8 +6839,8 @@ private NetworkDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -7156,7 +7191,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -7393,7 +7427,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -7406,12 +7440,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -8600,6 +8634,7 @@ public static final class ServiceDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ServiceDefinition)
ServiceDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ServiceDefinition.newBuilder() to construct.
private ServiceDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -8655,8 +8690,8 @@ private ServiceDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -10372,7 +10407,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -11215,7 +11249,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -11228,12 +11262,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -16073,6 +16107,7 @@ public static final class UnreachableStrategy extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.UnreachableStrategy)
UnreachableStrategyOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use UnreachableStrategy.newBuilder() to construct.
private UnreachableStrategy(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -16104,8 +16139,8 @@ private UnreachableStrategy(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -16230,7 +16265,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -16448,7 +16482,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -16461,12 +16495,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -16687,6 +16721,7 @@ public static final class Json extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Json)
JsonOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use Json.newBuilder() to construct.
private Json(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -16717,8 +16752,8 @@ private Json(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -16831,7 +16866,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -17036,7 +17070,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -17049,12 +17083,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -17258,6 +17292,7 @@ public static final class ResourceRoles extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ResourceRoles)
ResourceRolesOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ResourceRoles.newBuilder() to construct.
private ResourceRoles(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -17288,8 +17323,8 @@ private ResourceRoles(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -17395,7 +17430,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -17592,7 +17626,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -17605,12 +17639,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -17836,6 +17870,7 @@ public static final class ContainerInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ContainerInfo)
ContainerInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ContainerInfo.newBuilder() to construct.
private ContainerInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -17867,8 +17902,8 @@ private ContainerInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -17999,7 +18034,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -18213,7 +18247,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -18226,12 +18260,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -18576,6 +18610,7 @@ public static final class ExtendedContainerInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo)
ExtendedContainerInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ExtendedContainerInfo.newBuilder() to construct.
private ExtendedContainerInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -18608,8 +18643,8 @@ private ExtendedContainerInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -18891,6 +18926,7 @@ public static final class DockerInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.DockerInfo)
DockerInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use DockerInfo.newBuilder() to construct.
private DockerInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -18926,8 +18962,8 @@ private DockerInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -19064,6 +19100,7 @@ public static final class ImagePullConfig extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.DockerInfo.ImagePullConfig)
ImagePullConfigOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ImagePullConfig.newBuilder() to construct.
private ImagePullConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -19094,8 +19131,8 @@ private ImagePullConfig(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -19340,7 +19377,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -19564,7 +19600,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -19577,12 +19613,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -20006,6 +20042,7 @@ public static final class ObsoleteDockerPortMapping extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.DockerInfo.ObsoleteDockerPortMapping)
ObsoleteDockerPortMappingOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ObsoleteDockerPortMapping.newBuilder() to construct.
private ObsoleteDockerPortMapping(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -20041,8 +20078,8 @@ private ObsoleteDockerPortMapping(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -20350,7 +20387,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -20637,7 +20673,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -20650,12 +20686,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -21602,7 +21638,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -21897,7 +21932,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -21910,12 +21945,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -23102,6 +23137,7 @@ public static final class MesosDockerInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.MesosDockerInfo)
MesosDockerInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use MesosDockerInfo.newBuilder() to construct.
private MesosDockerInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -23133,8 +23169,8 @@ private MesosDockerInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -23428,7 +23464,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -23697,7 +23732,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -23710,12 +23745,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -24467,6 +24502,7 @@ public static final class MesosAppCInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.MesosAppCInfo)
MesosAppCInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use MesosAppCInfo.newBuilder() to construct.
private MesosAppCInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -24500,8 +24536,8 @@ private MesosAppCInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -24820,7 +24856,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -25078,7 +25113,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -25091,12 +25126,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -25928,6 +25963,7 @@ public static final class PortMapping extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ExtendedContainerInfo.PortMapping)
PortMappingOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use PortMapping.newBuilder() to construct.
private PortMapping(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -25964,8 +26000,8 @@ private PortMapping(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -26325,7 +26361,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -26621,7 +26656,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -26634,12 +26669,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -27644,7 +27679,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -27965,7 +27999,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -27978,12 +28012,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -29300,6 +29334,7 @@ public static final class Volume extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Volume)
VolumeOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use Volume.newBuilder() to construct.
private Volume(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -29332,8 +29367,8 @@ private Volume(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -29503,6 +29538,7 @@ public static final class PersistentVolumeInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Volume.PersistentVolumeInfo)
PersistentVolumeInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use PersistentVolumeInfo.newBuilder() to construct.
private PersistentVolumeInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -29536,8 +29572,8 @@ private PersistentVolumeInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -29744,7 +29780,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -30002,7 +30037,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -30015,12 +30050,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -30569,6 +30604,7 @@ public static final class ExternalVolumeInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Volume.ExternalVolumeInfo)
ExternalVolumeInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ExternalVolumeInfo.newBuilder() to construct.
private ExternalVolumeInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -30602,8 +30638,8 @@ private ExternalVolumeInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -30861,7 +30897,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -31119,7 +31154,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -31132,12 +31167,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -31730,6 +31765,7 @@ public static final class SecretVolumeInfo extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Volume.SecretVolumeInfo)
SecretVolumeInfoOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use SecretVolumeInfo.newBuilder() to construct.
private SecretVolumeInfo(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -31760,8 +31796,8 @@ private SecretVolumeInfo(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -31874,7 +31910,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -32079,7 +32114,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -32092,12 +32127,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -32647,7 +32682,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -32979,7 +33013,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -32992,12 +33026,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -34078,6 +34112,7 @@ public static final class StorageVersion extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.StorageVersion)
StorageVersionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use StorageVersion.newBuilder() to construct.
private StorageVersion(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -34111,8 +34146,8 @@ private StorageVersion(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -34392,7 +34427,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -34637,7 +34671,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -34650,12 +34684,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -34943,6 +34977,7 @@ public static final class UpgradeStrategyDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.UpgradeStrategyDefinition)
UpgradeStrategyDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use UpgradeStrategyDefinition.newBuilder() to construct.
private UpgradeStrategyDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -34974,8 +35009,8 @@ private UpgradeStrategyDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -35088,7 +35123,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -35310,7 +35344,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -35323,12 +35357,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -35689,6 +35723,7 @@ public static final class GroupDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.GroupDefinition)
GroupDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use GroupDefinition.newBuilder() to construct.
private GroupDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -35726,8 +35761,8 @@ private GroupDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -35879,6 +35914,7 @@ public static final class AppReference extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.GroupDefinition.AppReference)
AppReferenceOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use AppReference.newBuilder() to construct.
private AppReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -35910,8 +35946,8 @@ private AppReference(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -36082,7 +36118,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -36298,7 +36333,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -36311,12 +36346,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -37004,7 +37039,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -37343,7 +37377,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -37356,12 +37390,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -39269,6 +39303,7 @@ public static final class DeploymentPlanDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.DeploymentPlanDefinition)
DeploymentPlanDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use DeploymentPlanDefinition.newBuilder() to construct.
private DeploymentPlanDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -39302,8 +39337,8 @@ private DeploymentPlanDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -39699,7 +39734,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -39993,7 +40027,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -40006,12 +40040,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -40865,6 +40899,7 @@ public static final class TaskFailure extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.TaskFailure)
TaskFailureOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use TaskFailure.newBuilder() to construct.
private TaskFailure(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -40900,8 +40935,8 @@ private TaskFailure(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -41372,7 +41407,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -41695,7 +41729,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -41708,12 +41742,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -42583,6 +42617,7 @@ public static final class ZKStoreEntry extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ZKStoreEntry)
ZKStoreEntryOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ZKStoreEntry.newBuilder() to construct.
private ZKStoreEntry(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -42616,8 +42651,8 @@ private ZKStoreEntry(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -42831,7 +42866,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -43085,7 +43119,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -43098,12 +43132,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -43447,6 +43481,7 @@ public static final class ResidencyDefinition extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.ResidencyDefinition)
ResidencyDefinitionOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use ResidencyDefinition.newBuilder() to construct.
private ResidencyDefinition(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -43478,8 +43513,8 @@ private ResidencyDefinition(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -43685,7 +43720,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -43901,7 +43935,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -43914,12 +43948,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -44122,6 +44156,7 @@ public static final class Secret extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.Secret)
SecretOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use Secret.newBuilder() to construct.
private Secret(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -44153,8 +44188,8 @@ private Secret(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -44325,7 +44360,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -44541,7 +44575,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -44554,12 +44588,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -44864,6 +44898,7 @@ public static final class EnvVarReference extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.EnvVarReference)
EnvVarReferenceOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use EnvVarReference.newBuilder() to construct.
private EnvVarReference(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -44895,8 +44930,8 @@ private EnvVarReference(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -45184,7 +45219,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -45423,7 +45457,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -45436,12 +45470,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -45808,6 +45842,7 @@ public static final class EnvVarSecretRef extends
com.google.protobuf.GeneratedMessageV3 implements
// @@protoc_insertion_point(message_implements:mesosphere.marathon.EnvVarSecretRef)
EnvVarSecretRefOrBuilder {
+ private static final long serialVersionUID = 0L;
// Use EnvVarSecretRef.newBuilder() to construct.
private EnvVarSecretRef(com.google.protobuf.GeneratedMessageV3.Builder builder) {
super(builder);
@@ -45838,8 +45873,8 @@ private EnvVarSecretRef(
done = true;
break;
default: {
- if (!parseUnknownField(input, unknownFields,
- extensionRegistry, tag)) {
+ if (!parseUnknownField(
+ input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -45952,7 +45987,6 @@ public int getSerializedSize() {
return size;
}
- private static final long serialVersionUID = 0L;
@java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
@@ -46153,7 +46187,7 @@ public Builder clone() {
}
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.setField(field, value);
}
public Builder clearField(
@@ -46166,12 +46200,12 @@ public Builder clearOneof(
}
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- int index, Object value) {
+ int index, java.lang.Object value) {
return (Builder) super.setRepeatedField(field, index, value);
}
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
- Object value) {
+ java.lang.Object value) {
return (Builder) super.addRepeatedField(field, value);
}
public Builder mergeFrom(com.google.protobuf.Message other) {
@@ -46520,181 +46554,181 @@ public mesosphere.marathon.Protos.EnvVarSecretRef getDefaultInstanceForType() {
static {
java.lang.String[] descriptorData = {
"\n\016marathon.proto\022\023mesosphere.marathon\032\021m" +
- "esos/mesos.proto\"\274\001\n\nConstraint\022\r\n\005field" +
+ "esos/mesos.proto\"\314\001\n\nConstraint\022\r\n\005field" +
"\030\001 \002(\t\022:\n\010operator\030\002 \002(\0162(.mesosphere.ma" +
"rathon.Constraint.Operator\022\r\n\005value\030\003 \001(" +
- "\t\"T\n\010Operator\022\n\n\006UNIQUE\020\000\022\010\n\004LIKE\020\001\022\013\n\007C" +
+ "\t\"d\n\010Operator\022\n\n\006UNIQUE\020\000\022\010\n\004LIKE\020\001\022\013\n\007C" +
"LUSTER\020\002\022\014\n\010GROUP_BY\020\003\022\n\n\006UNLIKE\020\004\022\013\n\007MA" +
- "X_PER\020\005\"\342\003\n\025HealthCheckDefinition\022E\n\010pro" +
- "tocol\030\001 \002(\01623.mesosphere.marathon.Health" +
- "CheckDefinition.Protocol\022\021\n\tportIndex\030\002 " +
- "\001(\r\022\036\n\022gracePeriodSeconds\030\003 \001(\r:\00215\022\033\n\017i",
- "ntervalSeconds\030\004 \001(\r:\00210\022\032\n\016timeoutSecon" +
- "ds\030\005 \001(\r:\00220\022\017\n\004path\030\006 \001(\t:\001/\022!\n\026maxCons" +
- "ecutiveFailures\030\007 \001(\r:\0013\022#\n\007command\030\010 \001(" +
- "\0132\022.mesos.CommandInfo\022\034\n\rignoreHttp1xx\030\t" +
- " \001(\010:\005false\022\014\n\004port\030\n \001(\r\022\030\n\014delaySecond" +
- "s\030\013 \001(\r:\00215\022\020\n\010portName\030\014 \001(\t\"e\n\010Protoco" +
- "l\022\010\n\004HTTP\020\000\022\007\n\003TCP\020\001\022\013\n\007COMMAND\020\002\022\t\n\005HTT" +
- "PS\020\003\022\016\n\nMESOS_HTTP\020\004\022\017\n\013MESOS_HTTPS\020\005\022\r\n" +
- "\tMESOS_TCP\020\006\"\240\002\n\030ReadinessCheckDefinitio" +
- "n\022\014\n\004name\030\001 \001(\t\022H\n\010protocol\030\002 \001(\01626.meso",
- "sphere.marathon.ReadinessCheckDefinition" +
- ".Protocol\022\014\n\004path\030\003 \001(\t\022\020\n\010portName\030\004 \001(" +
- "\t\022\026\n\016intervalMillis\030\005 \001(\004\022\025\n\rtimeoutMill" +
- "is\030\006 \001(\004\022\036\n\026httpStatusCodeForReady\030\007 \003(\r" +
- "\022\034\n\024preserveLastResponse\030\010 \001(\010\"\037\n\010Protoc" +
- "ol\022\010\n\004HTTP\020\000\022\t\n\005HTTPS\020\001\"\231\001\n\021ObsoleteIpAd" +
- "dress\022\016\n\006groups\030\001 \003(\t\022\034\n\006labels\030\002 \003(\0132\014." +
- "mesos.Label\022A\n\rdiscoveryInfo\030\003 \001(\0132*.mes" +
- "osphere.marathon.ObsoleteDiscoveryInfo\022\023" +
- "\n\013networkName\030\004 \001(\t\"3\n\025ObsoleteDiscovery",
- "Info\022\032\n\005ports\030\001 \003(\0132\013.mesos.Port\"\264\001\n\021Net" +
- "workDefinition\0229\n\004mode\030\001 \001(\0162+.mesospher" +
- "e.marathon.NetworkDefinition.Mode\022\014\n\004nam" +
- "e\030\002 \001(\t\022\034\n\006labels\030\003 \003(\0132\014.mesos.Label\"8\n" +
- "\004Mode\022\013\n\007UNKNOWN\020\000\022\010\n\004HOST\020\001\022\r\n\tCONTAINE" +
- "R\020\002\022\n\n\006BRIDGE\020\003\"\276\013\n\021ServiceDefinition\022\n\n" +
- "\002id\030\001 \002(\t\022\037\n\003cmd\030\002 \002(\0132\022.mesos.CommandIn" +
- "fo\022\021\n\tinstances\030\003 \002(\r\022\"\n\tresources\030\004 \003(\013" +
- "2\017.mesos.Resource\022\023\n\013description\030\005 \001(\t\022\r" +
- "\n\005ports\030\006 \003(\r\0224\n\013constraints\030\007 \003(\0132\037.mes",
- "osphere.marathon.Constraint\022\022\n\010executor\030" +
- "\010 \002(\t:\000\022>\n\022OBSOLETE_container\030\n \001(\0132\".me" +
- "sosphere.marathon.ContainerInfo\022)\n\007versi" +
- "on\030\013 \001(\t:\0301970-01-01T00:00:00.000Z\022@\n\014he" +
- "althChecks\030\014 \003(\0132*.mesosphere.marathon.H" +
- "ealthCheckDefinition\022\025\n\007backoff\030\r \001(\003:\0041" +
- "000\022\033\n\rbackoffFactor\030\016 \001(\001:\0041.15\022G\n\017upgr" +
- "adeStrategy\030\017 \001(\0132..mesosphere.marathon." +
- "UpgradeStrategyDefinition\022\024\n\014dependencie" +
- "s\030\020 \003(\t\022\021\n\tstoreUrls\030\021 \003(\t\022\034\n\rrequire_po",
- "rts\030\022 \001(\010:\005false\022=\n\tcontainer\030\023 \001(\0132*.me" +
- "sosphere.marathon.ExtendedContainerInfo\022" +
- " \n\006labels\030\024 \003(\0132\020.mesos.Parameter\022\037\n\016max" +
- "LaunchDelay\030\025 \001(\003:\0073600000\022A\n\025acceptedRe" +
- "sourceRoles\030\026 \001(\0132\".mesosphere.marathon." +
- "ResourceRoles\022\027\n\017last_scaling_at\030\027 \001(\003\022\035" +
- "\n\025last_config_change_at\030\030 \001(\003\022B\n\022OBSOLET" +
- "E_ipAddress\030\031 \001(\0132&.mesosphere.marathon." +
- "ObsoleteIpAddress\022;\n\tresidency\030\032 \001(\0132(.m" +
- "esosphere.marathon.ResidencyDefinition\022$",
- "\n\017portDefinitions\030\033 \003(\0132\013.mesos.Port\022O\n\030" +
- "readinessCheckDefinition\030\034 \003(\0132-.mesosph" +
- "ere.marathon.ReadinessCheckDefinition\022,\n" +
- "\007secrets\030\035 \003(\0132\033.mesosphere.marathon.Sec" +
- "ret\022>\n\020envVarReferences\030\036 \003(\0132$.mesosphe" +
- "re.marathon.EnvVarReference\022\033\n\023taskKillG" +
- "racePeriod\030\037 \001(\003\022E\n\023unreachableStrategy\030" +
- " \001(\0132(.mesosphere.marathon.UnreachableS" +
- "trategy\022H\n\rkillSelection\030! \001(\0162\".mesosph" +
- "ere.marathon.KillSelection:\rYoungestFirs",
- "t\0228\n\010networks\030\" \003(\0132&.mesosphere.maratho" +
- "n.NetworkDefinition\022\033\n\003tty\030# \001(\0132\016.mesos" +
- ".TTYInfo\"]\n\023UnreachableStrategy\022!\n\024inact" +
- "iveAfterSeconds\030\001 \001(\004:\003900\022#\n\023expungeAft" +
- "erSeconds\030\002 \001(\004:\006604800\"\024\n\004Json\022\014\n\004json\030" +
- "\001 \002(\t\"\035\n\rResourceRoles\022\014\n\004role\030\001 \003(\t\"1\n\r" +
- "ContainerInfo\022\017\n\005image\030\001 \002(\014:\000\022\017\n\007option" +
- "s\030\002 \003(\014\"\356\013\n\025ExtendedContainerInfo\022\'\n\004typ" +
- "e\030\001 \002(\0162\031.mesos.ContainerInfo.Type\022,\n\007vo" +
- "lumes\030\002 \003(\0132\033.mesosphere.marathon.Volume",
- "\022M\n\rport_mappings\030\006 \003(\01326.mesosphere.mar" +
- "athon.ExtendedContainerInfo.PortMapping\022" +
- "E\n\006docker\030\003 \001(\01325.mesosphere.marathon.Ex" +
- "tendedContainerInfo.DockerInfo\022O\n\013mesosD" +
- "ocker\030\004 \001(\0132:.mesosphere.marathon.Extend" +
- "edContainerInfo.MesosDockerInfo\022K\n\tmesos" +
- "AppC\030\005 \001(\01328.mesosphere.marathon.Extende" +
- "dContainerInfo.MesosAppCInfo\032\361\004\n\nDockerI" +
- "nfo\022\r\n\005image\030\001 \002(\t\022G\n\020OBSOLETE_network\030\002" +
- " \001(\0162\'.mesos.ContainerInfo.DockerInfo.Ne",
- "twork:\004HOST\022o\n\026OBSOLETE_port_mappings\030\003 " +
- "\003(\0132O.mesosphere.marathon.ExtendedContai" +
- "nerInfo.DockerInfo.ObsoleteDockerPortMap" +
- "ping\022\031\n\nprivileged\030\004 \001(\010:\005false\022$\n\nparam" +
- "eters\030\005 \003(\0132\020.mesos.Parameter\022\030\n\020force_p" +
- "ull_image\030\006 \001(\010\032\236\001\n\017ImagePullConfig\022X\n\004t" +
- "ype\030\001 \002(\0162J.mesosphere.marathon.Extended" +
- "ContainerInfo.DockerInfo.ImagePullConfig" +
- ".Type\022\035\n\006secret\030\002 \001(\0132\r.mesos.Secret\"\022\n\004" +
- "Type\022\n\n\006SECRET\020\001\032\235\001\n\031ObsoleteDockerPortM",
- "apping\022\021\n\thost_port\030\001 \001(\r\022\026\n\016container_p" +
- "ort\030\002 \002(\r\022\020\n\010protocol\030\003 \001(\t\022\014\n\004name\030\004 \001(" +
- "\t\022\034\n\006labels\030\005 \003(\0132\014.mesos.Label\022\027\n\014servi" +
- "ce_port\030d \001(\r:\0010\032\310\001\n\017MesosDockerInfo\022\r\n\005" +
- "image\030\001 \002(\t\0220\n\025deprecated_credential\030\002 \001" +
- "(\0132\021.mesos.Credential\022\030\n\020force_pull_imag" +
- "e\030\003 \001(\010\022Z\n\013pull_config\030\004 \001(\0132E.mesospher" +
- "e.marathon.ExtendedContainerInfo.DockerI" +
- "nfo.ImagePullConfig\032b\n\rMesosAppCInfo\022\r\n\005" +
- "image\030\001 \002(\t\022\n\n\002id\030\002 \001(\t\022\034\n\006labels\030\003 \003(\0132",
- "\014.mesos.Label\022\030\n\020force_pull_image\030\004 \001(\010\032" +
- "\246\001\n\013PortMapping\022\021\n\thost_port\030\001 \001(\r\022\026\n\016co" +
- "ntainer_port\030\002 \002(\r\022\020\n\010protocol\030\003 \001(\t\022\014\n\004" +
- "name\030\004 \001(\t\022\034\n\006labels\030\005 \003(\0132\014.mesos.Label" +
- "\022\027\n\014service_port\030\006 \001(\r:\0010\022\025\n\rnetwork_nam" +
- "es\030\007 \003(\t\"\341\004\n\006Volume\022 \n\004mode\030\003 \002(\0162\022.meso" +
- "s.Volume.Mode\022\026\n\016container_path\030\001 \002(\t\022\021\n" +
- "\thost_path\030\002 \001(\t\022\033\n\005image\030\004 \001(\0132\014.mesos." +
- "Image\022D\n\npersistent\030\005 \001(\01320.mesosphere.m" +
- "arathon.Volume.PersistentVolumeInfo\022@\n\010e",
- "xternal\030\006 \001(\0132..mesosphere.marathon.Volu" +
- "me.ExternalVolumeInfo\022<\n\006secret\030\007 \001(\0132,." +
- "mesosphere.marathon.Volume.SecretVolumeI" +
- "nfo\032\237\001\n\024PersistentVolumeInfo\022\014\n\004size\030\001 \002" +
- "(\004\0222\n\004type\030\002 \001(\0162$.mesos.Resource.DiskIn" +
- "fo.Source.Type\0224\n\013constraints\030\003 \003(\0132\037.me" +
- "sosphere.marathon.Constraint\022\017\n\007maxSize\030" +
- "\004 \001(\004\032a\n\022ExternalVolumeInfo\022\014\n\004size\030\001 \001(" +
- "\004\022\014\n\004name\030\002 \002(\t\022\020\n\010provider\030\003 \002(\t\022\035\n\007opt" +
- "ions\030\004 \003(\0132\014.mesos.Label\032\"\n\020SecretVolume",
- "Info\022\016\n\006secret\030\001 \002(\t\"\274\001\n\016StorageVersion\022" +
- "\r\n\005major\030\001 \002(\r\022\r\n\005minor\030\002 \002(\r\022\r\n\005patch\030\003" +
- " \002(\r\022I\n\006format\030\004 \001(\01621.mesosphere.marath" +
- "on.StorageVersion.StorageFormat:\006LEGACY\"" +
- "2\n\rStorageFormat\022\n\n\006LEGACY\020\000\022\025\n\021PERSISTE" +
- "NCE_STORE\020\001\"Z\n\031UpgradeStrategyDefinition" +
- "\022\035\n\025minimumHealthCapacity\030\001 \002(\001\022\036\n\023maxim" +
- "umOverCapacity\030\002 \001(\001:\0011\"\236\003\n\017GroupDefinit" +
- "ion\022\n\n\002id\030\001 \002(\t\022\017\n\007version\030\002 \002(\t\022?\n\017depr" +
- "ecated_apps\030\003 \003(\0132&.mesosphere.marathon.",
- "ServiceDefinition\0222\n\017deprecated_pods\030\010 \003" +
- "(\0132\031.mesosphere.marathon.Json\0224\n\006groups\030" +
- "\004 \003(\0132$.mesosphere.marathon.GroupDefinit" +
- "ion\022\024\n\014dependencies\030\005 \003(\t\022?\n\004apps\030\006 \003(\0132" +
- "1.mesosphere.marathon.GroupDefinition.Ap" +
- "pReference\022?\n\004pods\030\007 \003(\01321.mesosphere.ma" +
- "rathon.GroupDefinition.AppReference\032+\n\014A" +
- "ppReference\022\n\n\002id\030\001 \002(\t\022\017\n\007version\030\002 \002(\t" +
- "\"\371\001\n\030DeploymentPlanDefinition\022\n\n\002id\030\001 \002(" +
- "\t\022\021\n\ttimestamp\030\002 \001(\t\022A\n\023deprecated_origi",
- "nal\030\004 \001(\0132$.mesosphere.marathon.GroupDef" +
- "inition\022?\n\021deprecated_target\030\005 \001(\0132$.mes" +
- "osphere.marathon.GroupDefinition\022\035\n\025orig" +
- "inal_root_version\030\006 \001(\t\022\033\n\023target_root_v" +
- "ersion\030\007 \001(\t\"\306\001\n\013TaskFailure\022\016\n\006app_id\030\001" +
- " \002(\t\022\036\n\007task_id\030\002 \002(\0132\r.mesos.TaskID\022\037\n\005" +
- "state\030\003 \002(\0162\020.mesos.TaskState\022\021\n\007message" +
- "\030\004 \001(\t:\000\022\016\n\004host\030\005 \001(\t:\000\022\017\n\007version\030\006 \002(" +
- "\t\022\021\n\ttimestamp\030\007 \002(\t\022\037\n\007slaveId\030\010 \001(\0132\016." +
- "mesos.SlaveID\"T\n\014ZKStoreEntry\022\014\n\004name\030\001 ",
- "\002(\t\022\014\n\004uuid\030\002 \002(\014\022\r\n\005value\030\003 \002(\014\022\031\n\ncomp" +
- "ressed\030\004 \001(\010:\005false\"\326\001\n\023ResidencyDefinit" +
- "ion\022(\n relaunchEscalationTimeoutSeconds\030" +
- "\001 \001(\003\022S\n\020taskLostBehavior\030\002 \001(\01629.mesosp" +
- "here.marathon.ResidencyDefinition.TaskLo" +
- "stBehavior\"@\n\020TaskLostBehavior\022\032\n\026RELAUN" +
- "CH_AFTER_TIMEOUT\020\000\022\020\n\014WAIT_FOREVER\020\001\"$\n\006" +
- "Secret\022\n\n\002id\030\001 \002(\t\022\016\n\006source\030\002 \002(\t\"\262\001\n\017E" +
- "nvVarReference\0227\n\004type\030\001 \002(\0162).mesospher" +
- "e.marathon.EnvVarReference.Type\022\014\n\004name\030",
- "\002 \002(\t\0227\n\tsecretRef\030\003 \001(\0132$.mesosphere.ma" +
- "rathon.EnvVarSecretRef\"\037\n\004Type\022\013\n\007UNKNOW" +
- "N\020\000\022\n\n\006SECRET\020\001\"#\n\017EnvVarSecretRef\022\020\n\010se" +
- "cretId\030\001 \002(\t*3\n\rKillSelection\022\021\n\rYounges" +
- "tFirst\020\001\022\017\n\013OldestFirst\020\002B\035\n\023mesosphere." +
- "marathonB\006Protos"
+ "X_PER\020\005\022\006\n\002IS\020\006\022\006\n\002IN\020\007\"\342\003\n\025HealthCheckD" +
+ "efinition\022E\n\010protocol\030\001 \002(\01623.mesosphere" +
+ ".marathon.HealthCheckDefinition.Protocol" +
+ "\022\021\n\tportIndex\030\002 \001(\r\022\036\n\022gracePeriodSecond",
+ "s\030\003 \001(\r:\00215\022\033\n\017intervalSeconds\030\004 \001(\r:\00210" +
+ "\022\032\n\016timeoutSeconds\030\005 \001(\r:\00220\022\017\n\004path\030\006 \001" +
+ "(\t:\001/\022!\n\026maxConsecutiveFailures\030\007 \001(\r:\0013" +
+ "\022#\n\007command\030\010 \001(\0132\022.mesos.CommandInfo\022\034\n" +
+ "\rignoreHttp1xx\030\t \001(\010:\005false\022\014\n\004port\030\n \001(" +
+ "\r\022\030\n\014delaySeconds\030\013 \001(\r:\00215\022\020\n\010portName\030" +
+ "\014 \001(\t\"e\n\010Protocol\022\010\n\004HTTP\020\000\022\007\n\003TCP\020\001\022\013\n\007" +
+ "COMMAND\020\002\022\t\n\005HTTPS\020\003\022\016\n\nMESOS_HTTP\020\004\022\017\n\013" +
+ "MESOS_HTTPS\020\005\022\r\n\tMESOS_TCP\020\006\"\240\002\n\030Readine" +
+ "ssCheckDefinition\022\014\n\004name\030\001 \001(\t\022H\n\010proto",
+ "col\030\002 \001(\01626.mesosphere.marathon.Readines" +
+ "sCheckDefinition.Protocol\022\014\n\004path\030\003 \001(\t\022" +
+ "\020\n\010portName\030\004 \001(\t\022\026\n\016intervalMillis\030\005 \001(" +
+ "\004\022\025\n\rtimeoutMillis\030\006 \001(\004\022\036\n\026httpStatusCo" +
+ "deForReady\030\007 \003(\r\022\034\n\024preserveLastResponse" +
+ "\030\010 \001(\010\"\037\n\010Protocol\022\010\n\004HTTP\020\000\022\t\n\005HTTPS\020\001\"" +
+ "\231\001\n\021ObsoleteIpAddress\022\016\n\006groups\030\001 \003(\t\022\034\n" +
+ "\006labels\030\002 \003(\0132\014.mesos.Label\022A\n\rdiscovery" +
+ "Info\030\003 \001(\0132*.mesosphere.marathon.Obsolet" +
+ "eDiscoveryInfo\022\023\n\013networkName\030\004 \001(\t\"3\n\025O",
+ "bsoleteDiscoveryInfo\022\032\n\005ports\030\001 \003(\0132\013.me" +
+ "sos.Port\"\264\001\n\021NetworkDefinition\0229\n\004mode\030\001" +
+ " \001(\0162+.mesosphere.marathon.NetworkDefini" +
+ "tion.Mode\022\014\n\004name\030\002 \001(\t\022\034\n\006labels\030\003 \003(\0132" +
+ "\014.mesos.Label\"8\n\004Mode\022\013\n\007UNKNOWN\020\000\022\010\n\004HO" +
+ "ST\020\001\022\r\n\tCONTAINER\020\002\022\n\n\006BRIDGE\020\003\"\276\013\n\021Serv" +
+ "iceDefinition\022\n\n\002id\030\001 \002(\t\022\037\n\003cmd\030\002 \002(\0132\022" +
+ ".mesos.CommandInfo\022\021\n\tinstances\030\003 \002(\r\022\"\n" +
+ "\tresources\030\004 \003(\0132\017.mesos.Resource\022\023\n\013des" +
+ "cription\030\005 \001(\t\022\r\n\005ports\030\006 \003(\r\0224\n\013constra",
+ "ints\030\007 \003(\0132\037.mesosphere.marathon.Constra" +
+ "int\022\022\n\010executor\030\010 \002(\t:\000\022>\n\022OBSOLETE_cont" +
+ "ainer\030\n \001(\0132\".mesosphere.marathon.Contai" +
+ "nerInfo\022)\n\007version\030\013 \001(\t:\0301970-01-01T00:" +
+ "00:00.000Z\022@\n\014healthChecks\030\014 \003(\0132*.mesos" +
+ "phere.marathon.HealthCheckDefinition\022\025\n\007" +
+ "backoff\030\r \001(\003:\0041000\022\033\n\rbackoffFactor\030\016 \001" +
+ "(\001:\0041.15\022G\n\017upgradeStrategy\030\017 \001(\0132..meso" +
+ "sphere.marathon.UpgradeStrategyDefinitio" +
+ "n\022\024\n\014dependencies\030\020 \003(\t\022\021\n\tstoreUrls\030\021 \003",
+ "(\t\022\034\n\rrequire_ports\030\022 \001(\010:\005false\022=\n\tcont" +
+ "ainer\030\023 \001(\0132*.mesosphere.marathon.Extend" +
+ "edContainerInfo\022 \n\006labels\030\024 \003(\0132\020.mesos." +
+ "Parameter\022\037\n\016maxLaunchDelay\030\025 \001(\003:\00736000" +
+ "00\022A\n\025acceptedResourceRoles\030\026 \001(\0132\".meso" +
+ "sphere.marathon.ResourceRoles\022\027\n\017last_sc" +
+ "aling_at\030\027 \001(\003\022\035\n\025last_config_change_at\030" +
+ "\030 \001(\003\022B\n\022OBSOLETE_ipAddress\030\031 \001(\0132&.meso" +
+ "sphere.marathon.ObsoleteIpAddress\022;\n\tres" +
+ "idency\030\032 \001(\0132(.mesosphere.marathon.Resid",
+ "encyDefinition\022$\n\017portDefinitions\030\033 \003(\0132" +
+ "\013.mesos.Port\022O\n\030readinessCheckDefinition" +
+ "\030\034 \003(\0132-.mesosphere.marathon.ReadinessCh" +
+ "eckDefinition\022,\n\007secrets\030\035 \003(\0132\033.mesosph" +
+ "ere.marathon.Secret\022>\n\020envVarReferences\030" +
+ "\036 \003(\0132$.mesosphere.marathon.EnvVarRefere" +
+ "nce\022\033\n\023taskKillGracePeriod\030\037 \001(\003\022E\n\023unre" +
+ "achableStrategy\030 \001(\0132(.mesosphere.marat" +
+ "hon.UnreachableStrategy\022H\n\rkillSelection" +
+ "\030! \001(\0162\".mesosphere.marathon.KillSelecti",
+ "on:\rYoungestFirst\0228\n\010networks\030\" \003(\0132&.me" +
+ "sosphere.marathon.NetworkDefinition\022\033\n\003t" +
+ "ty\030# \001(\0132\016.mesos.TTYInfo\"]\n\023UnreachableS" +
+ "trategy\022!\n\024inactiveAfterSeconds\030\001 \001(\004:\0039" +
+ "00\022#\n\023expungeAfterSeconds\030\002 \001(\004:\006604800\"" +
+ "\024\n\004Json\022\014\n\004json\030\001 \002(\t\"\035\n\rResourceRoles\022\014" +
+ "\n\004role\030\001 \003(\t\"1\n\rContainerInfo\022\017\n\005image\030\001" +
+ " \002(\014:\000\022\017\n\007options\030\002 \003(\014\"\356\013\n\025ExtendedCont" +
+ "ainerInfo\022\'\n\004type\030\001 \002(\0162\031.mesos.Containe" +
+ "rInfo.Type\022,\n\007volumes\030\002 \003(\0132\033.mesosphere",
+ ".marathon.Volume\022M\n\rport_mappings\030\006 \003(\0132" +
+ "6.mesosphere.marathon.ExtendedContainerI" +
+ "nfo.PortMapping\022E\n\006docker\030\003 \001(\01325.mesosp" +
+ "here.marathon.ExtendedContainerInfo.Dock" +
+ "erInfo\022O\n\013mesosDocker\030\004 \001(\0132:.mesosphere" +
+ ".marathon.ExtendedContainerInfo.MesosDoc" +
+ "kerInfo\022K\n\tmesosAppC\030\005 \001(\01328.mesosphere." +
+ "marathon.ExtendedContainerInfo.MesosAppC" +
+ "Info\032\361\004\n\nDockerInfo\022\r\n\005image\030\001 \002(\t\022G\n\020OB" +
+ "SOLETE_network\030\002 \001(\0162\'.mesos.ContainerIn",
+ "fo.DockerInfo.Network:\004HOST\022o\n\026OBSOLETE_" +
+ "port_mappings\030\003 \003(\0132O.mesosphere.maratho" +
+ "n.ExtendedContainerInfo.DockerInfo.Obsol" +
+ "eteDockerPortMapping\022\031\n\nprivileged\030\004 \001(\010" +
+ ":\005false\022$\n\nparameters\030\005 \003(\0132\020.mesos.Para" +
+ "meter\022\030\n\020force_pull_image\030\006 \001(\010\032\236\001\n\017Imag" +
+ "ePullConfig\022X\n\004type\030\001 \002(\0162J.mesosphere.m" +
+ "arathon.ExtendedContainerInfo.DockerInfo" +
+ ".ImagePullConfig.Type\022\035\n\006secret\030\002 \001(\0132\r." +
+ "mesos.Secret\"\022\n\004Type\022\n\n\006SECRET\020\001\032\235\001\n\031Obs",
+ "oleteDockerPortMapping\022\021\n\thost_port\030\001 \001(" +
+ "\r\022\026\n\016container_port\030\002 \002(\r\022\020\n\010protocol\030\003 " +
+ "\001(\t\022\014\n\004name\030\004 \001(\t\022\034\n\006labels\030\005 \003(\0132\014.meso" +
+ "s.Label\022\027\n\014service_port\030d \001(\r:\0010\032\310\001\n\017Mes" +
+ "osDockerInfo\022\r\n\005image\030\001 \002(\t\0220\n\025deprecate" +
+ "d_credential\030\002 \001(\0132\021.mesos.Credential\022\030\n" +
+ "\020force_pull_image\030\003 \001(\010\022Z\n\013pull_config\030\004" +
+ " \001(\0132E.mesosphere.marathon.ExtendedConta" +
+ "inerInfo.DockerInfo.ImagePullConfig\032b\n\rM" +
+ "esosAppCInfo\022\r\n\005image\030\001 \002(\t\022\n\n\002id\030\002 \001(\t\022",
+ "\034\n\006labels\030\003 \003(\0132\014.mesos.Label\022\030\n\020force_p" +
+ "ull_image\030\004 \001(\010\032\246\001\n\013PortMapping\022\021\n\thost_" +
+ "port\030\001 \001(\r\022\026\n\016container_port\030\002 \002(\r\022\020\n\010pr" +
+ "otocol\030\003 \001(\t\022\014\n\004name\030\004 \001(\t\022\034\n\006labels\030\005 \003" +
+ "(\0132\014.mesos.Label\022\027\n\014service_port\030\006 \001(\r:\001" +
+ "0\022\025\n\rnetwork_names\030\007 \003(\t\"\341\004\n\006Volume\022 \n\004m" +
+ "ode\030\003 \002(\0162\022.mesos.Volume.Mode\022\026\n\016contain" +
+ "er_path\030\001 \002(\t\022\021\n\thost_path\030\002 \001(\t\022\033\n\005imag" +
+ "e\030\004 \001(\0132\014.mesos.Image\022D\n\npersistent\030\005 \001(" +
+ "\01320.mesosphere.marathon.Volume.Persisten",
+ "tVolumeInfo\022@\n\010external\030\006 \001(\0132..mesosphe" +
+ "re.marathon.Volume.ExternalVolumeInfo\022<\n" +
+ "\006secret\030\007 \001(\0132,.mesosphere.marathon.Volu" +
+ "me.SecretVolumeInfo\032\237\001\n\024PersistentVolume" +
+ "Info\022\014\n\004size\030\001 \002(\004\0222\n\004type\030\002 \001(\0162$.mesos" +
+ ".Resource.DiskInfo.Source.Type\0224\n\013constr" +
+ "aints\030\003 \003(\0132\037.mesosphere.marathon.Constr" +
+ "aint\022\017\n\007maxSize\030\004 \001(\004\032a\n\022ExternalVolumeI" +
+ "nfo\022\014\n\004size\030\001 \001(\004\022\014\n\004name\030\002 \002(\t\022\020\n\010provi" +
+ "der\030\003 \002(\t\022\035\n\007options\030\004 \003(\0132\014.mesos.Label",
+ "\032\"\n\020SecretVolumeInfo\022\016\n\006secret\030\001 \002(\t\"\274\001\n" +
+ "\016StorageVersion\022\r\n\005major\030\001 \002(\r\022\r\n\005minor\030" +
+ "\002 \002(\r\022\r\n\005patch\030\003 \002(\r\022I\n\006format\030\004 \001(\01621.m" +
+ "esosphere.marathon.StorageVersion.Storag" +
+ "eFormat:\006LEGACY\"2\n\rStorageFormat\022\n\n\006LEGA" +
+ "CY\020\000\022\025\n\021PERSISTENCE_STORE\020\001\"Z\n\031UpgradeSt" +
+ "rategyDefinition\022\035\n\025minimumHealthCapacit" +
+ "y\030\001 \002(\001\022\036\n\023maximumOverCapacity\030\002 \001(\001:\0011\"" +
+ "\236\003\n\017GroupDefinition\022\n\n\002id\030\001 \002(\t\022\017\n\007versi" +
+ "on\030\002 \002(\t\022?\n\017deprecated_apps\030\003 \003(\0132&.meso",
+ "sphere.marathon.ServiceDefinition\0222\n\017dep" +
+ "recated_pods\030\010 \003(\0132\031.mesosphere.marathon" +
+ ".Json\0224\n\006groups\030\004 \003(\0132$.mesosphere.marat" +
+ "hon.GroupDefinition\022\024\n\014dependencies\030\005 \003(" +
+ "\t\022?\n\004apps\030\006 \003(\01321.mesosphere.marathon.Gr" +
+ "oupDefinition.AppReference\022?\n\004pods\030\007 \003(\013" +
+ "21.mesosphere.marathon.GroupDefinition.A" +
+ "ppReference\032+\n\014AppReference\022\n\n\002id\030\001 \002(\t\022" +
+ "\017\n\007version\030\002 \002(\t\"\371\001\n\030DeploymentPlanDefin" +
+ "ition\022\n\n\002id\030\001 \002(\t\022\021\n\ttimestamp\030\002 \001(\t\022A\n\023",
+ "deprecated_original\030\004 \001(\0132$.mesosphere.m" +
+ "arathon.GroupDefinition\022?\n\021deprecated_ta" +
+ "rget\030\005 \001(\0132$.mesosphere.marathon.GroupDe" +
+ "finition\022\035\n\025original_root_version\030\006 \001(\t\022" +
+ "\033\n\023target_root_version\030\007 \001(\t\"\306\001\n\013TaskFai" +
+ "lure\022\016\n\006app_id\030\001 \002(\t\022\036\n\007task_id\030\002 \002(\0132\r." +
+ "mesos.TaskID\022\037\n\005state\030\003 \002(\0162\020.mesos.Task" +
+ "State\022\021\n\007message\030\004 \001(\t:\000\022\016\n\004host\030\005 \001(\t:\000" +
+ "\022\017\n\007version\030\006 \002(\t\022\021\n\ttimestamp\030\007 \002(\t\022\037\n\007" +
+ "slaveId\030\010 \001(\0132\016.mesos.SlaveID\"T\n\014ZKStore",
+ "Entry\022\014\n\004name\030\001 \002(\t\022\014\n\004uuid\030\002 \002(\014\022\r\n\005val" +
+ "ue\030\003 \002(\014\022\031\n\ncompressed\030\004 \001(\010:\005false\"\326\001\n\023" +
+ "ResidencyDefinition\022(\n relaunchEscalatio" +
+ "nTimeoutSeconds\030\001 \001(\003\022S\n\020taskLostBehavio" +
+ "r\030\002 \001(\01629.mesosphere.marathon.ResidencyD" +
+ "efinition.TaskLostBehavior\"@\n\020TaskLostBe" +
+ "havior\022\032\n\026RELAUNCH_AFTER_TIMEOUT\020\000\022\020\n\014WA" +
+ "IT_FOREVER\020\001\"$\n\006Secret\022\n\n\002id\030\001 \002(\t\022\016\n\006so" +
+ "urce\030\002 \002(\t\"\262\001\n\017EnvVarReference\0227\n\004type\030\001" +
+ " \002(\0162).mesosphere.marathon.EnvVarReferen",
+ "ce.Type\022\014\n\004name\030\002 \002(\t\0227\n\tsecretRef\030\003 \001(\013" +
+ "2$.mesosphere.marathon.EnvVarSecretRef\"\037" +
+ "\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006SECRET\020\001\"#\n\017EnvVa" +
+ "rSecretRef\022\020\n\010secretId\030\001 \002(\t*3\n\rKillSele" +
+ "ction\022\021\n\rYoungestFirst\020\001\022\017\n\013OldestFirst\020" +
+ "\002B\035\n\023mesosphere.marathonB\006Protos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
diff --git a/src/main/proto/marathon.proto b/src/main/proto/marathon.proto
index ed3a9a81fda..e3695f3f293 100644
--- a/src/main/proto/marathon.proto
+++ b/src/main/proto/marathon.proto
@@ -26,6 +26,10 @@ message Constraint {
UNLIKE = 4;
// Field will be grouped by field. Value specifies the maximum size of each group.
MAX_PER = 5;
+ // Field must be the specified value
+ IS = 6;
+ // Field must be one of the specified values
+ IN = 7;
}
required Operator operator = 2;
optional string value = 3;
diff --git a/src/main/scala/mesosphere/mesos/Constraints.scala b/src/main/scala/mesosphere/mesos/Constraints.scala
index 08fba13a7dd..5574b456b7a 100644
--- a/src/main/scala/mesosphere/mesos/Constraints.scala
+++ b/src/main/scala/mesosphere/mesos/Constraints.scala
@@ -124,6 +124,8 @@ object Constraints {
case Operator.GROUP_BY => checkGroupBy(offerValue, placedValue)
case Operator.MAX_PER => checkMaxPer(offerValue, constraintValue.toInt, placedValue)
case Operator.CLUSTER => checkCluster(offerValue, placedValue)
+ case Operator.IS => offerValue == constraintValue
+ case Operator.IN => constraintValue.split(" *, *").contains(offerValue)
}
case None =>
// Only unlike can be matched if this offer does not have the specified value
diff --git a/src/test/scala/mesosphere/mesos/ConstraintsTest.scala b/src/test/scala/mesosphere/mesos/ConstraintsTest.scala
index 88e2293cd17..d19e86f8ca5 100644
--- a/src/test/scala/mesosphere/mesos/ConstraintsTest.scala
+++ b/src/test/scala/mesosphere/mesos/ConstraintsTest.scala
@@ -3,7 +3,7 @@ package mesosphere.mesos
import mesosphere.UnitTest
import mesosphere.marathon.Protos.Constraint
import mesosphere.marathon.Protos.Constraint.Operator
-import mesosphere.marathon.Protos.Constraint.Operator.{ LIKE, UNLIKE, CLUSTER, GROUP_BY, MAX_PER, UNIQUE }
+import mesosphere.marathon.Protos.Constraint.Operator.{ IN, IS, LIKE, UNLIKE, CLUSTER, GROUP_BY, MAX_PER, UNIQUE }
import mesosphere.marathon._
import mesosphere.marathon.core.instance.{ Instance, TestInstanceBuilder }
import mesosphere.marathon.state.{ AppDefinition, PathId }
@@ -645,6 +645,30 @@ class ConstraintsTest extends UnitTest {
}
}
+ "IS operator" should {
+ "require that a value match exactly" in {
+ makeOffer("righthost.com") should meetConstraint(hostnameField, IS, "righthost.com")
+ makeOffer("wronghost.com") should meetConstraint(hostnameField, IS, "wronghost.com")
+ }
+ }
+
+ "IN operator" should {
+ "require that the offer value be in the comma delimited list of values" in {
+ makeOffer("host1") should meetConstraint(hostnameField, IN, "host1,host2")
+ makeOffer("host3") shouldNot meetConstraint(hostnameField, IN, "host1,host2")
+ }
+
+ "trims whitespace after the commas (but not before)" in {
+ makeOffer("host1") should meetConstraint(hostnameField, IN, "host1, host2")
+ makeOffer("host1") should meetConstraint(hostnameField, IN, "host1 , host2")
+ makeOffer("host1") should meetConstraint(hostnameField, IN, "host1 ,host2")
+ }
+
+ "does not match if offer does not have the value in question" in {
+ makeOffer("host1") shouldNot meetConstraint(regionField, IN, "region1")
+ }
+ }
+
private def makeSampleInstanceWithTextAttrs(runSpecId: PathId, attrs: Map[String, String]): Instance = {
val attributes: Seq[Attribute] = attrs.map {
case (name, value) =>