http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/nested_mesos_containerizer_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp index efc57ad..22bd995 100644 --- a/src/tests/containerizer/nested_mesos_containerizer_tests.cpp +++ b/src/tests/containerizer/nested_mesos_containerizer_tests.cpp @@ -111,7 +111,7 @@ protected: SlaveState slaveState; slaveState.id = slaveId; FrameworkID frameworkId; - frameworkId.set_value(UUID::random().toString()); + frameworkId.set_value(id::UUID::random().toString()); slaveState.frameworks.put(frameworkId, frameworkState); // NOTE: The executor directory must exist for executor containers @@ -138,10 +138,10 @@ protected: TEST_F(NestedMesosContainerizerTest, NestedContainerID) { ContainerID id1; - id1.set_value(UUID::random().toString()); + id1.set_value(id::UUID::random().toString()); ContainerID id2; - id2.set_value(UUID::random().toString()); + id2.set_value(id::UUID::random().toString()); EXPECT_EQ(id1, id1); EXPECT_NE(id1, id2); @@ -193,7 +193,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_LaunchNested) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -212,7 +212,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_LaunchNested) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -267,7 +267,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); const string envKey = "MESOS_NESTED_INHERITS_ENVIRONMENT"; const int32_t envValue = 42; @@ -305,7 +305,7 @@ TEST_F(NestedMesosContainerizerTest, { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launchNested = containerizer->launch( nestedContainerId, @@ -339,7 +339,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launchNested = containerizer->launch( nestedContainerId, @@ -390,7 +390,7 @@ TEST_F(NestedMesosContainerizerTest, { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launchNested = containerizer->launch( nestedContainerId, @@ -450,7 +450,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a pipe to pass parent's MESOS_SANDBOX value to a child container. Try<std::array<int_fd, 2>> pipes_ = os::pipe(); @@ -496,7 +496,7 @@ TEST_F(NestedMesosContainerizerTest, { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); // NOTE: We use a non-shell command here to use 'bash -c' to execute // the 'read', which deals with the file descriptor, because of a bug @@ -571,7 +571,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a pipe to synchronize with the top-level container. Try<std::array<int_fd, 2>> pipes_ = os::pipe(); @@ -631,7 +631,7 @@ TEST_F(NestedMesosContainerizerTest, { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launchNested = containerizer->launch( nestedContainerId, @@ -681,7 +681,7 @@ TEST_F(NestedMesosContainerizerTest, { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Future<Containerizer::LaunchResult> launchNested = containerizer->launch( nestedContainerId, @@ -739,7 +739,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -758,7 +758,7 @@ TEST_F(NestedMesosContainerizerTest, // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); // Launch the nested container with the `ps | wc -l` command and // launch the container without a `ContainerClass`. With this @@ -858,7 +858,7 @@ TEST_F(NestedMesosContainerizerTest, // Launch the parent container. ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -881,7 +881,7 @@ TEST_F(NestedMesosContainerizerTest, // with the parent container. ContainerID nestedContainerId1; nestedContainerId1.mutable_parent()->CopyFrom(containerId); - nestedContainerId1.set_value(UUID::random().toString()); + nestedContainerId1.set_value(id::UUID::random().toString()); ContainerInfo container; container.set_type(ContainerInfo::MESOS); @@ -908,7 +908,7 @@ TEST_F(NestedMesosContainerizerTest, // Launch the second nested container which will have its own pid namespace. ContainerID nestedContainerId2; nestedContainerId2.mutable_parent()->CopyFrom(containerId); - nestedContainerId2.set_value(UUID::random().toString()); + nestedContainerId2.set_value(id::UUID::random().toString()); container.mutable_linux_info()->set_share_pid_namespace(false); @@ -1063,7 +1063,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom( statusRunning->container_status().container_id()); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); // Launch a debug container inside the command task and check for // the existence of a file we know to be inside the `alpine` docker @@ -1120,7 +1120,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -1152,7 +1152,7 @@ TEST_F(NestedMesosContainerizerTest, // Now launch a debug container which should be destroyed on recovery. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1238,7 +1238,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyNested) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -1257,7 +1257,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyNested) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1315,7 +1315,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyParent) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -1334,7 +1334,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_DestroyParent) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1390,7 +1390,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentExit) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<std::array<int_fd, 2>> pipes_ = os::pipe(); ASSERT_SOME(pipes_); @@ -1426,7 +1426,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentExit) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1484,7 +1484,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentSigterm) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a pipe to synchronize with the top-level container. Try<std::array<int_fd, 2>> pipes_ = os::pipe(); @@ -1522,7 +1522,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_ParentSigterm) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1589,7 +1589,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNested) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -1621,7 +1621,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNested) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1729,7 +1729,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedWithoutConfig) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -1761,7 +1761,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedWithoutConfig) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -1883,7 +1883,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverLauncherOrphans) ASSERT_SOME(freezerHierarchy); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); const string cgroup = path::join( flags.cgroups_root, @@ -1929,7 +1929,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedLauncherOrphans) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -1970,7 +1970,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_RecoverNestedLauncherOrphans) ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); const string cgroup = path::join( flags.cgroups_root, @@ -2057,7 +2057,7 @@ TEST_F(NestedMesosContainerizerTest, ASSERT_SOME(freezerHierarchy); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); string cgroup = path::join( flags.cgroups_root, @@ -2067,7 +2067,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); cgroup = path::join( flags.cgroups_root, @@ -2124,7 +2124,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -2165,7 +2165,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId1; nestedContainerId1.mutable_parent()->CopyFrom(containerId); - nestedContainerId1.set_value(UUID::random().toString()); + nestedContainerId1.set_value(id::UUID::random().toString()); string cgroup = path::join( flags.cgroups_root, @@ -2175,7 +2175,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId2; nestedContainerId2.mutable_parent()->CopyFrom(containerId); - nestedContainerId2.set_value(UUID::random().toString()); + nestedContainerId2.set_value(id::UUID::random().toString()); cgroup = path::join( flags.cgroups_root, @@ -2264,7 +2264,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "executor", @@ -2296,7 +2296,7 @@ TEST_F(NestedMesosContainerizerTest, // Now launch the first nested container. ContainerID nestedContainerId1; nestedContainerId1.mutable_parent()->CopyFrom(containerId); - nestedContainerId1.set_value(UUID::random().toString()); + nestedContainerId1.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId1, @@ -2324,7 +2324,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId2; nestedContainerId2.mutable_parent()->CopyFrom(containerId); - nestedContainerId2.set_value(UUID::random().toString()); + nestedContainerId2.set_value(id::UUID::random().toString()); const string cgroup = path::join( flags.cgroups_root, @@ -2429,7 +2429,7 @@ TEST_F(NestedMesosContainerizerTest, ASSERT_SOME(freezerHierarchy); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); string cgroup = path::join( flags.cgroups_root, @@ -2439,7 +2439,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId1; nestedContainerId1.mutable_parent()->CopyFrom(containerId); - nestedContainerId1.set_value(UUID::random().toString()); + nestedContainerId1.set_value(id::UUID::random().toString()); cgroup = path::join( flags.cgroups_root, @@ -2449,7 +2449,7 @@ TEST_F(NestedMesosContainerizerTest, ContainerID nestedContainerId2; nestedContainerId2.mutable_parent()->CopyFrom(containerId); - nestedContainerId2.set_value(UUID::random().toString()); + nestedContainerId2.set_value(id::UUID::random().toString()); cgroup = path::join( flags.cgroups_root, @@ -2512,7 +2512,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_AgentEnvironmentNotLeaked) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -2531,7 +2531,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_AgentEnvironmentNotLeaked) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); // Construct a command that verifies that agent environment // variables are not leaked to the nested container. @@ -2600,7 +2600,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_Remove) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -2619,7 +2619,7 @@ TEST_F(NestedMesosContainerizerTest, ROOT_CGROUPS_Remove) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -2694,7 +2694,7 @@ TEST_F(NestedMesosContainerizerTest, AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Try<string> directory = environment->mkdtemp(); ASSERT_SOME(directory); @@ -2713,7 +2713,7 @@ TEST_F(NestedMesosContainerizerTest, // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId,
http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/port_mapping_tests.cpp b/src/tests/containerizer/port_mapping_tests.cpp index 38db7e5..575ba46 100644 --- a/src/tests/containerizer/port_mapping_tests.cpp +++ b/src/tests/containerizer/port_mapping_tests.cpp @@ -466,7 +466,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP) Resources::parse(container1Ports).get()); ContainerID containerId1; - containerId1.set_value(UUID::random().toString()); + containerId1.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -532,7 +532,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerTCP) ASSERT_TRUE(waitForFileCreation(container1Ready)); ContainerID containerId2; - containerId2.set_value(UUID::random().toString()); + containerId2.set_value(id::UUID::random().toString()); executorInfo.mutable_resources()->CopyFrom( Resources::parse(container2Ports).get()); @@ -629,7 +629,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP) Resources::parse(container1Ports).get()); ContainerID containerId1; - containerId1.set_value(UUID::random().toString()); + containerId1.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -695,7 +695,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_ContainerToContainerUDP) ASSERT_TRUE(waitForFileCreation(container1Ready)); ContainerID containerId2; - containerId2.set_value(UUID::random().toString()); + containerId2.set_value(id::UUID::random().toString()); executorInfo.mutable_resources()->CopyFrom( Resources::parse(container2Ports).get()); @@ -794,7 +794,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerUDP) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -912,7 +912,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_HostToContainerTCP) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1038,7 +1038,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPExternal) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1125,7 +1125,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerICMPInternal) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1215,7 +1215,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ContainerARPExternal) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1311,7 +1311,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_DNS) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1403,7 +1403,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers) Resources::parse(container1Ports).get()); ContainerID containerId1; - containerId1.set_value(UUID::random().toString()); + containerId1.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1453,7 +1453,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_TooManyContainers) ::close(pipes[1]); ContainerID containerId2; - containerId2.set_value(UUID::random().toString()); + containerId2.set_value(id::UUID::random().toString()); executorInfo.mutable_resources()->CopyFrom( Resources::parse(container2Ports).get()); @@ -1522,7 +1522,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_SmallEgressLimit) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. @@ -1686,7 +1686,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_NC_PortMappingStatistics) Resources::parse(container1Ports).get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); // Use a relative temporary directory so it gets cleaned up // automatically with the test. http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/provisioner_appc_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_appc_tests.cpp b/src/tests/containerizer/provisioner_appc_tests.cpp index ca9c61e..5edd89b 100644 --- a/src/tests/containerizer/provisioner_appc_tests.cpp +++ b/src/tests/containerizer/provisioner_appc_tests.cpp @@ -375,8 +375,8 @@ TEST_F(ProvisionerAppcTest, ROOT_ProvisionNestedContainer) ContainerID parent; ContainerID child; - parent.set_value(UUID::random().toString()); - child.set_value(UUID::random().toString()); + parent.set_value(id::UUID::random().toString()); + child.set_value(id::UUID::random().toString()); child.mutable_parent()->CopyFrom(parent); Future<slave::ProvisionInfo> provisionInfo = @@ -443,7 +443,7 @@ TEST_F(ProvisionerAppcTest, Recover) image.mutable_appc()->CopyFrom(getTestImage()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); Future<slave::ProvisionInfo> provisionInfo = provisioner.get()->provision(containerId, image); @@ -516,8 +516,8 @@ TEST_F(ProvisionerAppcTest, RecoverNestedContainer) ContainerID parent; ContainerID child; - parent.set_value(UUID::random().toString()); - child.set_value(UUID::random().toString()); + parent.set_value(id::UUID::random().toString()); + child.set_value(id::UUID::random().toString()); child.mutable_parent()->CopyFrom(parent); AWAIT_READY(provisioner.get()->provision(parent, image)); @@ -585,8 +585,8 @@ TEST_F(ProvisionerAppcTest, RecoverNestedContainerNoParentImage) ContainerID parent; ContainerID child; - parent.set_value(UUID::random().toString()); - child.set_value(UUID::random().toString()); + parent.set_value(id::UUID::random().toString()); + child.set_value(id::UUID::random().toString()); child.mutable_parent()->CopyFrom(parent); AWAIT_READY(provisioner.get()->provision(child, image)); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/provisioner_docker_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/provisioner_docker_tests.cpp b/src/tests/containerizer/provisioner_docker_tests.cpp index 9842743..c664ff8 100644 --- a/src/tests/containerizer/provisioner_docker_tests.cpp +++ b/src/tests/containerizer/provisioner_docker_tests.cpp @@ -1066,11 +1066,11 @@ TEST_F(ProvisionerDockerTest, ROOT_RecoverNestedOnReboot) ASSERT_SOME(provisioner); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); Image image; image.set_type(Image::DOCKER); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/runtime_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/runtime_isolator_tests.cpp b/src/tests/containerizer/runtime_isolator_tests.cpp index 09ced98..b703b82 100644 --- a/src/tests/containerizer/runtime_isolator_tests.cpp +++ b/src/tests/containerizer/runtime_isolator_tests.cpp @@ -133,7 +133,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultCmdLocalPuller) TaskInfo task; task.set_name("test-task"); - task.mutable_task_id()->set_value(UUID::random().toString()); + task.mutable_task_id()->set_value(id::UUID::random().toString()); task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get()); task.mutable_command()->set_shell(false); @@ -223,7 +223,7 @@ TEST_F(DockerRuntimeIsolatorTest, ROOT_DockerDefaultEntryptLocalPuller) TaskInfo task; task.set_name("test-task"); - task.mutable_task_id()->set_value(UUID::random().toString()); + task.mutable_task_id()->set_value(id::UUID::random().toString()); task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get()); task.mutable_command()->set_shell(false); @@ -303,7 +303,7 @@ TEST_F(DockerRuntimeIsolatorTest, TaskInfo task; task.set_name("test-task"); - task.mutable_task_id()->set_value(UUID::random().toString()); + task.mutable_task_id()->set_value(id::UUID::random().toString()); task.mutable_slave_id()->CopyFrom(offer.slave_id()); task.mutable_resources()->CopyFrom(Resources::parse("cpus:1;mem:128").get()); task.mutable_command()->set_shell(false); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_host_path_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_host_path_isolator_tests.cpp b/src/tests/containerizer/volume_host_path_isolator_tests.cpp index 271bbbe..e4d0734 100644 --- a/src/tests/containerizer/volume_host_path_isolator_tests.cpp +++ b/src/tests/containerizer/volume_host_path_isolator_tests.cpp @@ -83,7 +83,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_VolumeFromHost) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -140,7 +140,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_FileVolumeFromHost) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -198,7 +198,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_VolumeFromHostSandboxMountPoint) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -255,7 +255,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_FileVolumeFromHostSandboxMountPoint) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -304,7 +304,7 @@ TEST_F(VolumeHostPathIsolatorTest, ROOT_MountPropagation) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); string mountDirectory = path::join(flags.work_dir, "mount_directory"); string mountPoint = path::join(mountDirectory, "mount_point"); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_image_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_image_isolator_tests.cpp b/src/tests/containerizer/volume_image_isolator_tests.cpp index da36422..3aa19e2 100644 --- a/src/tests/containerizer/volume_image_isolator_tests.cpp +++ b/src/tests/containerizer/volume_image_isolator_tests.cpp @@ -94,7 +94,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerInfo container = createContainerInfo( None(), @@ -126,7 +126,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithoutRootFilesystem) if (nesting) { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, @@ -182,7 +182,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem) Owned<Containerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerInfo container = createContainerInfo( "test_image_rootfs", @@ -216,7 +216,7 @@ TEST_P(VolumeImageIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem) if (nesting) { ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId, http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp index 5b75852..0400052 100644 --- a/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp +++ b/src/tests/containerizer/volume_sandbox_path_isolator_tests.cpp @@ -78,7 +78,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfType) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -137,7 +137,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo("executor", "sleep 99", "cpus:1"); @@ -154,7 +154,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume) ContainerID nestedContainerId1; nestedContainerId1.mutable_parent()->CopyFrom(containerId); - nestedContainerId1.set_value(UUID::random().toString()); + nestedContainerId1.set_value(id::UUID::random().toString()); ContainerInfo containerInfo; containerInfo.set_type(ContainerInfo::MESOS); @@ -182,7 +182,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, SharedParentTypeVolume) ContainerID nestedContainerId2; nestedContainerId2.mutable_parent()->CopyFrom(containerId); - nestedContainerId2.set_value(UUID::random().toString()); + nestedContainerId2.set_value(id::UUID::random().toString()); launch = containerizer->launch( nestedContainerId2, @@ -240,7 +240,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_SelfTypeOwnership) Owned<MesosContainerizer> containerizer(create.get()); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo( "test_executor", @@ -303,7 +303,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_ParentTypeOwnership) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ExecutorInfo executor = createExecutorInfo("executor", "sleep 99", "cpus:1"); @@ -324,7 +324,7 @@ TEST_F(VolumeSandboxPathIsolatorTest, ROOT_ParentTypeOwnership) ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); ContainerInfo containerInfo; containerInfo.set_type(ContainerInfo::MESOS); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/containerizer/volume_secret_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/volume_secret_isolator_tests.cpp b/src/tests/containerizer/volume_secret_isolator_tests.cpp index 4d03a02..56691ae 100644 --- a/src/tests/containerizer/volume_secret_isolator_tests.cpp +++ b/src/tests/containerizer/volume_secret_isolator_tests.cpp @@ -181,7 +181,7 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem) AWAIT_READY(containerizer->recover(state)); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); ContainerInfo containerInfo; if (fsType == WITH_ROOTFS) { @@ -221,7 +221,7 @@ TEST_P(VolumeSecretIsolatorTest, ROOT_SecretInVolumeWithRootFilesystem) // Now launch nested container. ContainerID nestedContainerId; nestedContainerId.mutable_parent()->CopyFrom(containerId); - nestedContainerId.set_value(UUID::random().toString()); + nestedContainerId.set_value(id::UUID::random().toString()); CommandInfo nestedCommand = createCommandInfo( "secret=$(cat " + secretContainerPath + "); " http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/fault_tolerance_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fault_tolerance_tests.cpp b/src/tests/fault_tolerance_tests.cpp index 6f69b6f..2dfd009 100644 --- a/src/tests/fault_tolerance_tests.cpp +++ b/src/tests/fault_tolerance_tests.cpp @@ -1325,7 +1325,7 @@ TEST_F(FaultToleranceTest, ForwardStatusUpdateUnknownExecutor) taskId, TASK_RUNNING, TaskStatus::SOURCE_SLAVE, - UUID::random(), + id::UUID::random(), "Dummy update"); process::dispatch( @@ -1988,7 +1988,7 @@ TEST_F(FaultToleranceTest, SplitBrainMasters) runningStatus->task_id(), TASK_LOST, TaskStatus::SOURCE_SLAVE, - UUID::random())); + id::UUID::random())); // Spoof a message from a random master; this should be dropped by // the scheduler driver. Since this is delivered locally, it is http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/fetcher_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/fetcher_tests.cpp b/src/tests/fetcher_tests.cpp index 967d256..bce59d4 100644 --- a/src/tests/fetcher_tests.cpp +++ b/src/tests/fetcher_tests.cpp @@ -111,7 +111,7 @@ TEST_F(FetcherTest, FileURI) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -149,7 +149,7 @@ TEST_F(FetcherTest, ROOT_RootProtectedFileURI) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; commandInfo.set_user(user); @@ -181,7 +181,7 @@ TEST_F(FetcherTest, CustomOutputFileSubdirectory) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -218,7 +218,7 @@ TEST_F(FetcherTest, AbsoluteCustomSubdirectoryFails) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -258,10 +258,10 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, InvalidUser) flags.frameworks_home = "/tmp/frameworks"; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; - commandInfo.set_user(UUID::random().toString()); + commandInfo.set_user(id::UUID::random().toString()); CommandInfo::URI* uri = commandInfo.add_uris(); uri->set_value(uri::from_path(testFile)); @@ -295,7 +295,7 @@ TEST_F(FetcherTest, NonExistingFile) flags.frameworks_home = "/tmp/frameworks"; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -322,7 +322,7 @@ TEST_F(FetcherTest, MalformedURI) flags.frameworks_home = "/tmp/frameworks"; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -355,7 +355,7 @@ TEST_F(FetcherTest, AbsoluteFilePath) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -387,7 +387,7 @@ TEST_F(FetcherTest, RelativeFilePath) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -480,7 +480,7 @@ TEST_F(FetcherTest, OSNetUriTest) flags.frameworks_home = "/tmp/frameworks"; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -526,7 +526,7 @@ TEST_F(FetcherTest, OSNetUriSpaceTest) flags.frameworks_home = "/tmp/frameworks"; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -565,7 +565,7 @@ TEST_F(FetcherTest, FileLocalhostURI) flags.launcher_dir = getLauncherDir(); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -595,7 +595,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractNotExecutable) ASSERT_SOME(path); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -637,7 +637,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, NoExtractExecutable) ASSERT_SOME(path); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -692,7 +692,7 @@ TEST_F(FetcherTest, ExtractNotExecutable) "tar cf '" + path.get() + ".tar.gz' '" + path.get() + "' 2>&1")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -753,7 +753,7 @@ TEST_F(FetcherTest, ExtractTar) "tar cf '" + path.get() + ".tar' '" + path.get() + "' 2>&1")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -799,7 +799,7 @@ TEST_F(FetcherTest, ExtractGzipFile) ASSERT_SOME(os::shell("gzip " + path.get())); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -849,7 +849,7 @@ TEST_F(FetcherTest, Unzip_ExtractFile) ASSERT_SOME(os::rename(path.get(), path.get() + ".zip")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -902,7 +902,7 @@ TEST_F(FetcherTest, Unzip_ExtractInvalidFile) ASSERT_SOME(os::rename(path.get(), path.get() + ".zip")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -976,7 +976,7 @@ TEST_F(FetcherTest, Unzip_ExtractFileWithDuplicatedEntries) ASSERT_SOME(os::rename(path.get(), path.get() + ".zip")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -1017,7 +1017,7 @@ TEST_F(FetcherTest, UseCustomOutputFile) ASSERT_SOME(os::write(path.get(), "hello renamed file")); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); const string customOutputFile = "custom.txt"; CommandInfo commandInfo; @@ -1060,7 +1060,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(FetcherTest, CustomGzipOutputFile) ASSERT_SOME(os::shell("gzip " + path.get())); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); const string customOutputFile = "custom"; CommandInfo commandInfo; @@ -1159,7 +1159,7 @@ TEST_F(FetcherTest, HdfsURI) flags.hadoop_home = hadoopPath; ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); @@ -1213,7 +1213,7 @@ TEST_F(FetcherTest, SSLEnvironmentSpillover) ASSERT_SOME(os::shell("gzip " + path.get())); ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); CommandInfo commandInfo; CommandInfo::URI* uri = commandInfo.add_uris(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/master_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp index a488403..e41bd94 100644 --- a/src/tests/master_tests.cpp +++ b/src/tests/master_tests.cpp @@ -6997,7 +6997,7 @@ TEST_F(MasterTest, DISABLED_RecoverResourcesOrphanedTask) status.mutable_executor_id()->CopyFrom(evolve(executorId)); status.set_state(v1::TASK_FINISHED); status.set_source(v1::TaskStatus::SOURCE_EXECUTOR); - status.set_uuid(UUID::random().toBytes()); + status.set_uuid(id::UUID::random().toBytes()); v1::executor::Call call; call.mutable_framework_id()->CopyFrom(frameworkId); @@ -8474,12 +8474,12 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(MasterTest, RegistryGcByCount) AWAIT_READY(registered); TaskStatus status1; - status1.mutable_task_id()->set_value(UUID::random().toString()); + status1.mutable_task_id()->set_value(id::UUID::random().toString()); status1.mutable_slave_id()->CopyFrom(slaveId); status1.set_state(TASK_STAGING); // Dummy value. TaskStatus status2; - status2.mutable_task_id()->set_value(UUID::random().toString()); + status2.mutable_task_id()->set_value(id::UUID::random().toString()); status2.mutable_slave_id()->CopyFrom(slaveId2); status2.set_state(TASK_STAGING); // Dummy value. http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/master_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/master_validation_tests.cpp b/src/tests/master_validation_tests.cpp index 48c69a5..d6216cc 100644 --- a/src/tests/master_validation_tests.cpp +++ b/src/tests/master_validation_tests.cpp @@ -1411,7 +1411,7 @@ TEST_F(TaskValidationTest, ExecutorUsesInvalidFrameworkID) // Create an executor with a random framework id. ExecutorInfo executor; executor = DEFAULT_EXECUTOR_INFO; - executor.mutable_framework_id()->set_value(UUID::random().toString()); + executor.mutable_framework_id()->set_value(id::UUID::random().toString()); EXPECT_CALL(sched, resourceOffers(&driver, _)) .WillOnce(LaunchTasks(executor, 1, 1, 16, "*")) @@ -2560,7 +2560,7 @@ TEST_F(ExecutorValidationTest, ExecutorType) { ExecutorInfo executorInfo; executorInfo = DEFAULT_EXECUTOR_INFO; - executorInfo.mutable_framework_id()->set_value(UUID::random().toString()); + executorInfo.mutable_framework_id()->set_value(id::UUID::random().toString()); { // 'CUSTOM' executor with `CommandInfo` set is valid. @@ -4147,11 +4147,11 @@ TEST_F(RegisterSlaveValidationTest, DropInvalidReregistration) ReregisterSlaveMessage message = reregisterSlaveMessage.get(); Task* task = message.add_tasks(); - task->set_name(UUID::random().toString()); - task->mutable_slave_id()->set_value(UUID::random().toString()); - task->mutable_task_id()->set_value(UUID::random().toString()); - task->mutable_framework_id()->set_value(UUID::random().toString()); - task->mutable_executor_id()->set_value(UUID::random().toString()); + task->set_name(id::UUID::random().toString()); + task->mutable_slave_id()->set_value(id::UUID::random().toString()); + task->mutable_task_id()->set_value(id::UUID::random().toString()); + task->mutable_framework_id()->set_value(id::UUID::random().toString()); + task->mutable_executor_id()->set_value(id::UUID::random().toString()); task->set_state(TASK_RUNNING); // We expect the master to drop the ReregisterSlaveMessage, so it @@ -4199,9 +4199,9 @@ TEST_F(RegisterSlaveValidationTest, DropInvalidRegistration) slaveInfo->mutable_id()->set_value( strings::join( "/../", - UUID::random().toString(), - UUID::random().toString(), - UUID::random().toString())); + id::UUID::random().toString(), + id::UUID::random().toString(), + id::UUID::random().toString())); // Send the modified message to the master. process::post(slave.get()->pid, master->get()->pid, message); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp index 7ed08a5..1031283 100644 --- a/src/tests/mesos.cpp +++ b/src/tests/mesos.cpp @@ -683,7 +683,8 @@ slave::Flags ContainerizerTest<slave::MesosContainerizer>::CreateSlaveFlags() if (cgroups::enabled() && user.get() == "root") { flags.isolation = "cgroups/cpu,cgroups/mem"; flags.cgroups_hierarchy = baseHierarchy; - flags.cgroups_root = TEST_CGROUPS_ROOT + "_" + UUID::random().toString(); + flags.cgroups_root = + TEST_CGROUPS_ROOT + "_" + id::UUID::random().toString(); } else { flags.isolation = "posix/cpu,posix/mem"; } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/mesos.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index 320e975..821cce3 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -803,7 +803,7 @@ inline TTaskInfo createTask( const TCommandInfo& command, const Option<TExecutorID>& executorId = None(), const std::string& name = "test-task", - const std::string& id = UUID::random().toString()) + const std::string& id = id::UUID::random().toString()) { TTaskInfo task; task.set_name(name); @@ -837,7 +837,7 @@ inline TTaskInfo createTask( const std::string& command, const Option<TExecutorID>& executorId = None(), const std::string& name = "test-task", - const std::string& id = UUID::random().toString()) + const std::string& id = id::UUID::random().toString()) { return createTask< TTaskInfo, @@ -869,7 +869,7 @@ inline TTaskInfo createTask( const std::string& command, const Option<TExecutorID>& executorId = None(), const std::string& name = "test-task", - const std::string& id = UUID::random().toString()) + const std::string& id = id::UUID::random().toString()) { return createTask< TTaskInfo, @@ -2737,7 +2737,7 @@ ACTION_P3(SendUpdateFromTask, frameworkId, executorId, state) status.mutable_executor_id()->CopyFrom(executorId); status.set_state(state); status.set_source(mesos::v1::TaskStatus::SOURCE_EXECUTOR); - status.set_uuid(UUID::random().toBytes()); + status.set_uuid(id::UUID::random().toBytes()); mesos::v1::executor::Call call; call.mutable_framework_id()->CopyFrom(frameworkId); @@ -2758,7 +2758,7 @@ ACTION_P3(SendUpdateFromTaskID, frameworkId, executorId, state) status.mutable_executor_id()->CopyFrom(executorId); status.set_state(state); status.set_source(mesos::v1::TaskStatus::SOURCE_EXECUTOR); - status.set_uuid(UUID::random().toBytes()); + status.set_uuid(id::UUID::random().toBytes()); mesos::v1::executor::Call call; call.mutable_framework_id()->CopyFrom(frameworkId); @@ -2996,7 +2996,7 @@ public: typename Call::UpdateState* update = call.mutable_update_state(); update->mutable_resources()->CopyFrom(injected); - update->set_resource_version_uuid(UUID::random().toBytes()); + update->set_resource_version_uuid(id::UUID::random().toBytes()); driver->send(call); } http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/offer_operation_status_update_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/offer_operation_status_update_manager_tests.cpp b/src/tests/offer_operation_status_update_manager_tests.cpp index e56fb0e..4c92e86 100644 --- a/src/tests/offer_operation_status_update_manager_tests.cpp +++ b/src/tests/offer_operation_status_update_manager_tests.cpp @@ -88,8 +88,8 @@ protected: } OfferOperationStatusUpdate createOfferOperationStatusUpdate( - const UUID& statusUuid, - const UUID& operationUuid, + const id::UUID& statusUuid, + const id::UUID& operationUuid, const OfferOperationState& state, const Option<FrameworkID>& frameworkId = None()) { @@ -121,7 +121,7 @@ protected: forward, OfferOperationStatusUpdateManagerTest::getPath); } - static const string getPath(const UUID& operationUuid) + static const string getPath(const id::UUID& operationUuid) { return path::join(os::getcwd(), "streams", operationUuid.toString()); } @@ -139,8 +139,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateAndAck) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_FINISHED); @@ -174,8 +174,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateAndAckNonTerminalUpdate) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING); @@ -211,8 +211,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, ResendUnacknowledged) .WillOnce(FutureArg<0>(&forwardedStatusUpdate1)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate2)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, operationUuid, OfferOperationState::OFFER_OPERATION_FINISHED); @@ -256,8 +256,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, Cleanup) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); FrameworkID frameworkId; frameworkId.set_value("frameworkId"); @@ -298,8 +298,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverCheckpointedStream) .WillOnce(FutureArg<0>(&forwardedStatusUpdate1)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate2)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -356,8 +356,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverNotCheckpointedStream) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -395,8 +395,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverEmptyFile) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -452,8 +452,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverEmptyDirectory) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -503,8 +503,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RecoverTerminatedStream) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -561,8 +561,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, IgnoreDuplicateUpdate) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -601,8 +601,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, IgnoreDuplicateUpdateAfterRecover) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -646,8 +646,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RejectDuplicateAck) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -687,8 +687,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, RejectDuplicateAckAfterRecover) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -735,8 +735,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, NonStrictRecoveryCorruptedFile) .WillOnce(FutureArg<0>(&forwardedStatusUpdate1)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate2)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -801,8 +801,8 @@ TEST_F(OfferOperationStatusUpdateManagerTest, StrictRecoveryCorruptedFile) EXPECT_CALL(statusUpdateProcessor, update(_)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate)); - const UUID operationUuid = UUID::random(); - const UUID statusUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); + const id::UUID statusUuid = id::UUID::random(); OfferOperationStatusUpdate statusUpdate = createOfferOperationStatusUpdate( statusUuid, @@ -851,9 +851,9 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateLatestWhenResending) .WillOnce(FutureArg<0>(&forwardedStatusUpdate2)) .WillOnce(FutureArg<0>(&forwardedStatusUpdate3)); - const UUID operationUuid = UUID::random(); + const id::UUID operationUuid = id::UUID::random(); - const UUID statusUuid1 = UUID::random(); + const id::UUID statusUuid1 = id::UUID::random(); OfferOperationStatusUpdate statusUpdate1 = createOfferOperationStatusUpdate( statusUuid1, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING); @@ -872,7 +872,7 @@ TEST_F(OfferOperationStatusUpdateManagerTest, UpdateLatestWhenResending) EXPECT_FALSE(forwardedStatusUpdate2.isReady()); // Send another status update. - const UUID statusUuid2 = UUID::random(); + const id::UUID statusUuid2 = id::UUID::random(); OfferOperationStatusUpdate statusUpdate2 = createOfferOperationStatusUpdate( statusUuid2, operationUuid, OfferOperationState::OFFER_OPERATION_PENDING); AWAIT_ASSERT_READY(statusUpdateManager->update(statusUpdate2, true)); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/partition_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/partition_tests.cpp b/src/tests/partition_tests.cpp index a5a1468..9fcc0a8 100644 --- a/src/tests/partition_tests.cpp +++ b/src/tests/partition_tests.cpp @@ -1731,7 +1731,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates) taskId1, TASK_RUNNING, TaskStatus::SOURCE_SLAVE, - UUID::random()); + id::UUID::random()); StatusUpdateMessage message1; message1.mutable_update()->CopyFrom(update1); @@ -1771,7 +1771,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, PartitionedSlaveStatusUpdates) taskId2, TASK_RUNNING, TaskStatus::SOURCE_SLAVE, - UUID::random()); + id::UUID::random()); StatusUpdateMessage message2; message2.mutable_update()->CopyFrom(update2); @@ -2553,7 +2553,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount) // the unreachable list; hence `unreachable_time` should be set on // the result of the reconciliation request. TaskStatus status1; - status1.mutable_task_id()->set_value(UUID::random().toString()); + status1.mutable_task_id()->set_value(id::UUID::random().toString()); status1.mutable_slave_id()->CopyFrom(slaveId1); status1.set_state(TASK_STAGING); // Dummy value. @@ -2576,7 +2576,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount) // Because the agent has been removed from the unreachable list in // the registry, `unreachable_time` should NOT be set. TaskStatus status2; - status2.mutable_task_id()->set_value(UUID::random().toString()); + status2.mutable_task_id()->set_value(id::UUID::random().toString()); status2.mutable_slave_id()->CopyFrom(slaveId1); status2.set_state(TASK_STAGING); // Dummy value. @@ -2595,7 +2595,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCount) // partitioned slave. Because the agent is still in the unreachable // list in the registry, `unreachable_time` should be set. TaskStatus status3; - status3.mutable_task_id()->set_value(UUID::random().toString()); + status3.mutable_task_id()->set_value(id::UUID::random().toString()); status3.mutable_slave_id()->CopyFrom(slaveId2); status3.set_state(TASK_STAGING); // Dummy value. @@ -2648,7 +2648,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves) vector<SlaveID> slaveIDs; for (int i = 0; i < 50; i++) { SlaveID slaveID; - slaveID.set_value(UUID::random().toString()); + slaveID.set_value(id::UUID::random().toString()); slaveIDs.push_back(slaveID); SlaveInfo slaveInfo; @@ -2704,7 +2704,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves) SlaveID removedSlaveID = *(slaveIDs.crbegin() + 1); TaskStatus status1; - status1.mutable_task_id()->set_value(UUID::random().toString()); + status1.mutable_task_id()->set_value(id::UUID::random().toString()); status1.mutable_slave_id()->CopyFrom(keptSlaveID); status1.set_state(TASK_STAGING); // Dummy value. @@ -2720,7 +2720,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByCountManySlaves) EXPECT_EQ(unreachableTime, reconcileUpdate1->unreachable_time()); TaskStatus status2; - status2.mutable_task_id()->set_value(UUID::random().toString()); + status2.mutable_task_id()->set_value(id::UUID::random().toString()); status2.mutable_slave_id()->CopyFrom(removedSlaveID); status2.set_state(TASK_STAGING); // Dummy value. @@ -2917,7 +2917,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge) // Since neither slave has exceeded the age-based GC bound, we // expect to find both slaves (i.e., `unreachable_time` will be set). TaskStatus status1; - status1.mutable_task_id()->set_value(UUID::random().toString()); + status1.mutable_task_id()->set_value(id::UUID::random().toString()); status1.mutable_slave_id()->CopyFrom(slaveId1); status1.set_state(TASK_STAGING); // Dummy value. @@ -2933,7 +2933,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge) EXPECT_EQ(partitionTime1, reconcileUpdate1->unreachable_time()); TaskStatus status2; - status2.mutable_task_id()->set_value(UUID::random().toString()); + status2.mutable_task_id()->set_value(id::UUID::random().toString()); status2.mutable_slave_id()->CopyFrom(slaveId2); status2.set_state(TASK_STAGING); // Dummy value. @@ -2956,7 +2956,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge) // We expect `slave1` to have been garbage collected, but `slave2` // should still be present in the registry. TaskStatus status3; - status3.mutable_task_id()->set_value(UUID::random().toString()); + status3.mutable_task_id()->set_value(id::UUID::random().toString()); status3.mutable_slave_id()->CopyFrom(slaveId1); status3.set_state(TASK_STAGING); // Dummy value. @@ -2972,7 +2972,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge) EXPECT_FALSE(reconcileUpdate3->has_unreachable_time()); TaskStatus status4; - status4.mutable_task_id()->set_value(UUID::random().toString()); + status4.mutable_task_id()->set_value(id::UUID::random().toString()); status4.mutable_slave_id()->CopyFrom(slaveId2); status4.set_state(TASK_STAGING); // Dummy value. @@ -2995,7 +2995,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcByAge) // expect that it has been garbage collected, which means // `unreachable_time` will not be set. TaskStatus status5; - status5.mutable_task_id()->set_value(UUID::random().toString()); + status5.mutable_task_id()->set_value(id::UUID::random().toString()); status5.mutable_slave_id()->CopyFrom(slaveId2); status5.set_state(TASK_STAGING); // Dummy value. @@ -3249,7 +3249,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace) // unreachable list. We use reconciliation to verify this. TaskStatus status1; - status1.mutable_task_id()->set_value(UUID::random().toString()); + status1.mutable_task_id()->set_value(id::UUID::random().toString()); status1.mutable_slave_id()->CopyFrom(slaveId1); status1.set_state(TASK_STAGING); // Dummy value. @@ -3265,7 +3265,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace) EXPECT_FALSE(reconcileUpdate1->has_unreachable_time()); TaskStatus status2; - status2.mutable_task_id()->set_value(UUID::random().toString()); + status2.mutable_task_id()->set_value(id::UUID::random().toString()); status2.mutable_slave_id()->CopyFrom(slaveId2); status2.set_state(TASK_STAGING); // Dummy value. @@ -3281,7 +3281,7 @@ TEST_F_TEMP_DISABLED_ON_WINDOWS(PartitionTest, RegistryGcRace) EXPECT_FALSE(reconcileUpdate2->has_unreachable_time()); TaskStatus status3; - status3.mutable_task_id()->set_value(UUID::random().toString()); + status3.mutable_task_id()->set_value(id::UUID::random().toString()); status3.mutable_slave_id()->CopyFrom(slaveId3); status3.set_state(TASK_STAGING); // Dummy value. http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/paths_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/paths_tests.cpp b/src/tests/paths_tests.cpp index 07e0cac..dc765ed 100644 --- a/src/tests/paths_tests.cpp +++ b/src/tests/paths_tests.cpp @@ -47,7 +47,7 @@ public: frameworkId.set_value("framework1"); executorId.set_value("executor1"); taskId.set_value("task1"); - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); role = "role1"; persistenceId = "persistenceId1"; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/reconciliation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/reconciliation_tests.cpp b/src/tests/reconciliation_tests.cpp index f88b115..9ee91c9 100644 --- a/src/tests/reconciliation_tests.cpp +++ b/src/tests/reconciliation_tests.cpp @@ -258,8 +258,8 @@ TEST_F(ReconciliationTest, UnknownSlave) // Create a task status with a random slave id and task id. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); - status.mutable_slave_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); + status.mutable_slave_id()->set_value(id::UUID::random().toString()); status.set_state(TASK_STAGING); // Dummy value. driver.reconcileTasks({status}); @@ -316,7 +316,7 @@ TEST_F(ReconciliationTest, UnknownTask) // Create a task status with a random task id. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.mutable_slave_id()->CopyFrom(slaveId); status.set_state(TASK_STAGING); // Dummy value. @@ -378,7 +378,7 @@ TEST_F(ReconciliationTest, UnknownTaskPartitionAware) // Create a task status with a random task id. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.mutable_slave_id()->CopyFrom(slaveId); status.set_state(TASK_STAGING); // Dummy value. @@ -422,7 +422,7 @@ TEST_F(ReconciliationTest, UnknownKillTask) // Create a task status with a random task id. TaskID taskId; - taskId.set_value(UUID::random().toString()); + taskId.set_value(id::UUID::random().toString()); driver.killTask(taskId); @@ -500,7 +500,7 @@ TEST_F(ReconciliationTest, RecoveredAgent) // Reconcile for a random task ID on the slave. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.mutable_slave_id()->CopyFrom(slaveId); status.set_state(TASK_STAGING); // Dummy value. @@ -600,7 +600,7 @@ TEST_F(ReconciliationTest, RecoveredAgentReregistrationInProgress) // Reconcile for a random task ID on the slave. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.mutable_slave_id()->CopyFrom(slaveId); status.set_state(TASK_STAGING); // Dummy value. @@ -690,7 +690,7 @@ TEST_F(ReconciliationTest, RemovalInProgress) // Reconcile for a random task ID on the slave. TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.mutable_slave_id()->CopyFrom(slaveId); status.set_state(TASK_STAGING); // Dummy value. http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/registrar_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/registrar_tests.cpp b/src/tests/registrar_tests.cpp index f93129f..34365c7 100644 --- a/src/tests/registrar_tests.cpp +++ b/src/tests/registrar_tests.cpp @@ -1214,7 +1214,7 @@ class MockStorage : public Storage { public: MOCK_METHOD1(get, Future<Option<Entry>>(const string&)); - MOCK_METHOD2(set, Future<bool>(const Entry&, const UUID&)); + MOCK_METHOD2(set, Future<bool>(const Entry&, const id::UUID&)); MOCK_METHOD1(expunge, Future<bool>(const Entry&)); MOCK_METHOD0(names, Future<std::set<string>>()); }; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/resource_provider_manager_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resource_provider_manager_tests.cpp b/src/tests/resource_provider_manager_tests.cpp index e069c62..b5edc6d 100644 --- a/src/tests/resource_provider_manager_tests.cpp +++ b/src/tests/resource_provider_manager_tests.cpp @@ -249,7 +249,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState) ResourceProviderManager manager; - Option<UUID> streamId; + Option<id::UUID> streamId; Option<mesos::v1::ResourceProviderID> resourceProviderId; // First, subscribe to the manager to get the ID. @@ -278,7 +278,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState) ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id")); - Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id")); + Try<id::UUID> uuid = + id::UUID::fromString(response->headers.at("Mesos-Stream-Id")); CHECK_SOME(uuid); streamId = uuid.get(); @@ -318,7 +319,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateState) Call::UpdateState* updateState = call.mutable_update_state(); updateState->mutable_resources()->CopyFrom(v1::Resources(resources)); - updateState->set_resource_version_uuid(UUID::random().toBytes()); + updateState->set_resource_version_uuid(id::UUID::random().toBytes()); http::Request request; request.method = "POST"; @@ -354,7 +355,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus) ResourceProviderManager manager; - Option<UUID> streamId; + Option<id::UUID> streamId; Option<mesos::v1::ResourceProviderID> resourceProviderId; // First, subscribe to the manager to get the ID. @@ -383,7 +384,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus) ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id")); - Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id")); + Try<id::UUID> uuid = + id::UUID::fromString(response->headers.at("Mesos-Stream-Id")); CHECK_SOME(uuid); streamId = uuid.get(); @@ -416,7 +418,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, UpdateOfferOperationStatus) mesos::v1::OfferOperationStatus status; status.set_state(mesos::v1::OfferOperationState::OFFER_OPERATION_FINISHED); - UUID operationUUID = UUID::random(); + id::UUID operationUUID = id::UUID::random(); Call call; call.set_type(Call::UPDATE_OFFER_OPERATION_STATUS); @@ -471,7 +473,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess) ResourceProviderManager manager; - Option<UUID> streamId; + Option<id::UUID> streamId; Option<mesos::v1::ResourceProviderID> resourceProviderId; Owned<recordio::Reader<Event>> responseDecoder; @@ -501,7 +503,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesSuccess) ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id")); - Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id")); + Try<id::UUID> uuid = + id::UUID::fromString(response->headers.at("Mesos-Stream-Id")); CHECK_SOME(uuid); streamId = uuid.get(); @@ -577,7 +580,7 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure) ResourceProviderManager manager; - Option<UUID> streamId; + Option<id::UUID> streamId; Option<mesos::v1::ResourceProviderID> resourceProviderId; Owned<recordio::Reader<Event>> responseDecoder; @@ -607,7 +610,8 @@ TEST_P(ResourceProviderManagerHttpApiTest, PublishResourcesFailure) ASSERT_EQ(http::Response::PIPE, response->type); ASSERT_TRUE(response->headers.contains("Mesos-Stream-Id")); - Try<UUID> uuid = UUID::fromString(response->headers.at("Mesos-Stream-Id")); + Try<id::UUID> uuid = + id::UUID::fromString(response->headers.at("Mesos-Stream-Id")); CHECK_SOME(uuid); streamId = uuid.get(); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/resource_provider_validation_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/resource_provider_validation_tests.cpp b/src/tests/resource_provider_validation_tests.cpp index bf789a0..22c7742 100644 --- a/src/tests/resource_provider_validation_tests.cpp +++ b/src/tests/resource_provider_validation_tests.cpp @@ -64,7 +64,7 @@ TEST(ResourceProviderCallValidationTest, UpdateOfferOperationStatus) EXPECT_SOME(error); ResourceProviderID* id = call.mutable_resource_provider_id(); - id->set_value(UUID::random().toString()); + id->set_value(id::UUID::random().toString()); // Still expecting `Call::UpdateOfferOperationStatus`. error = call::validate(call); @@ -73,11 +73,11 @@ TEST(ResourceProviderCallValidationTest, UpdateOfferOperationStatus) Call::UpdateOfferOperationStatus* update = call.mutable_update_offer_operation_status(); - update->mutable_framework_id()->set_value(UUID::random().toString()); - update->set_operation_uuid(UUID::random().toBytes()); + update->mutable_framework_id()->set_value(id::UUID::random().toString()); + update->set_operation_uuid(id::UUID::random().toBytes()); OfferOperationStatus* status = update->mutable_status(); - status->mutable_operation_id()->set_value(UUID::random().toString()); + status->mutable_operation_id()->set_value(id::UUID::random().toString()); status->set_state(OFFER_OPERATION_FINISHED); error = call::validate(call); @@ -95,14 +95,14 @@ TEST(ResourceProviderCallValidationTest, UpdateState) EXPECT_SOME(error); ResourceProviderID* id = call.mutable_resource_provider_id(); - id->set_value(UUID::random().toString()); + id->set_value(id::UUID::random().toString()); // Still expecting `Call::UpdateState`. error = call::validate(call); EXPECT_SOME(error); Call::UpdateState* updateState = call.mutable_update_state(); - updateState->set_resource_version_uuid(UUID::random().toBytes()); + updateState->set_resource_version_uuid(id::UUID::random().toBytes()); error = call::validate(call); EXPECT_NONE(error); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/scheduler_event_call_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/scheduler_event_call_tests.cpp b/src/tests/scheduler_event_call_tests.cpp index 48649f2..88813c4 100644 --- a/src/tests/scheduler_event_call_tests.cpp +++ b/src/tests/scheduler_event_call_tests.cpp @@ -539,7 +539,8 @@ TEST_F(SchedulerDriverEventTest, Update) AWAIT_READY(statusUpdate); // Generate an update that requires acknowledgement. - event.mutable_update()->mutable_status()->set_uuid(UUID::random().toBytes()); + event.mutable_update()->mutable_status()->set_uuid( + id::UUID::random().toBytes()); Future<mesos::scheduler::Call> acknowledgement = DROP_CALL( mesos::scheduler::Call(), mesos::scheduler::Call::ACKNOWLEDGE, _, _); http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/scheduler_http_api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/scheduler_http_api_tests.cpp b/src/tests/scheduler_http_api_tests.cpp index 67782ed..02cfe54 100644 --- a/src/tests/scheduler_http_api_tests.cpp +++ b/src/tests/scheduler_http_api_tests.cpp @@ -379,7 +379,7 @@ TEST_P(SchedulerHttpApiTest, SubscribeWithStreamId) process::http::Headers headers = createBasicAuthHeaders(DEFAULT_CREDENTIAL); headers["Accept"] = contentType; - headers["Mesos-Stream-Id"] = UUID::random().toString(); + headers["Mesos-Stream-Id"] = id::UUID::random().toString(); Future<Response> response = process::http::streaming::post( master.get()->pid, http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp index b7e8d3d..4ba0b8e 100644 --- a/src/tests/slave_authorization_tests.cpp +++ b/src/tests/slave_authorization_tests.cpp @@ -850,7 +850,7 @@ TEST_F(ExecutorAuthorizationTest, FailedSubscribe) hashmap<string, string> claims; claims["fid"] = frameworkId.value(); claims["eid"] = v1::DEFAULT_EXECUTOR_ID.value(); - claims["cid"] = UUID::random().toString(); + claims["cid"] = id::UUID::random().toString(); Principal principal(None(), claims); @@ -1059,7 +1059,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls) hashmap<string, string> claims; claims["fid"] = frameworkId.value(); claims["eid"] = v1::DEFAULT_EXECUTOR_ID.value(); - claims["cid"] = UUID::random().toString(); + claims["cid"] = id::UUID::random().toString(); Principal incorrectPrincipal(None(), claims); @@ -1074,7 +1074,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls) AWAIT_READY(authenticationToken); v1::ContainerID containerId; - containerId.set_value(UUID::random().toString()); + containerId.set_value(id::UUID::random().toString()); containerId.mutable_parent()->CopyFrom(executorSubscribed->container_id()); http::Headers headers; @@ -1194,9 +1194,9 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls) { v1::TaskStatus status; - status.mutable_task_id()->set_value(UUID::random().toString()); + status.mutable_task_id()->set_value(id::UUID::random().toString()); status.set_state(v1::TASK_RUNNING); - status.set_uuid(UUID::random().toBytes()); + status.set_uuid(id::UUID::random().toBytes()); status.set_source(v1::TaskStatus::SOURCE_EXECUTOR); v1::executor::Call call; http://git-wip-us.apache.org/repos/asf/mesos/blob/7467c810/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 555f186..bf2c5fc 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -334,7 +334,7 @@ TYPED_TEST(SlaveRecoveryTest, RecoverSlaveState) .tasks[task.task_id()] .updates.front().uuid()); - const UUID uuid = UUID::fromBytes(ack->acknowledge().uuid()).get(); + const id::UUID uuid = id::UUID::fromBytes(ack->acknowledge().uuid()).get(); ASSERT_TRUE(state .frameworks[frameworkId] .executors[executorId]
