Merge #2226

2226: Parse memory, disk parameters in the client. r=ricab a=luis4a0 Fixes #2224. Co-authored-by: Luis Peñaranda <luis.penaranda@canonical.com>
canonical · Sep 16, 2021 · 8cf75b0 · 8cf75b0
2 parents fb522fc + f59d5bf
commit 8cf75b0
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/src/client/cli/cmd/launch.cpp b/src/client/cli/cmd/launch.cpp
@@ -25,6 +25,7 @@
 #include <multipass/exceptions/cmd_exceptions.h>
 #include <multipass/exceptions/snap_environment_exception.h>
 #include <multipass/format.h>
+#include <multipass/memory_size.h>
 #include <multipass/settings.h>
 #include <multipass/snap_utils.h>
 #include <multipass/utils.h>
@@ -277,12 +278,20 @@ mp::ParseCode cmd::Launch::parse_args(mp::ArgParser* parser)
 
     if (parser->isSet(memOption))
     {
-        request.set_mem_size(parser->value(memOption).toStdString());
+        auto arg_mem_size = parser->value(memOption).toStdString();
+
+        mp::MemorySize{arg_mem_size}; // throw if bad
+
+        request.set_mem_size(arg_mem_size);
     }
 
     if (parser->isSet(diskOption))
     {
-        request.set_disk_space(parser->value(diskOption).toStdString());
+        auto arg_disk_size = parser->value(diskOption).toStdString();
+
+        mp::MemorySize{arg_disk_size}; // throw if bad
+
+        request.set_disk_space(arg_disk_size);
     }
 
     if (parser->isSet(cloudInitOption))

diff --git a/tests/test_cli_client.cpp b/tests/test_cli_client.cpp
@@ -619,6 +619,28 @@ TEST_F(Client, launch_cmd_good_arguments)
     EXPECT_THAT(send_command({"launch", "foo"}), Eq(mp::ReturnCode::Ok));
 }
 
+TEST_F(Client, launch_cmd_wrong_mem_arguments)
+{
+    EXPECT_CALL(mock_daemon, launch(_, _, _)).Times(0);
+    MP_EXPECT_THROW_THAT(send_command({"launch", "-m", "wrong"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("wrong is not a valid memory size")));
+    MP_EXPECT_THROW_THAT(send_command({"launch", "--mem", "1.23f"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("1.23f is not a valid memory size")));
+    MP_EXPECT_THROW_THAT(send_command({"launch", "-mem", "2048M"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("em is not a valid memory size"))); // note single dash
+}
+
+TEST_F(Client, launch_cmd_wrong_disk_arguments)
+{
+    EXPECT_CALL(mock_daemon, launch(_, _, _)).Times(0);
+    MP_EXPECT_THROW_THAT(send_command({"launch", "-d", "wrong"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("wrong is not a valid memory size")));
+    MP_EXPECT_THROW_THAT(send_command({"launch", "--disk", "4.56f"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("4.56f is not a valid memory size")));
+    MP_EXPECT_THROW_THAT(send_command({"launch", "-disk", "8192M"}), std::runtime_error,
+                         mpt::match_what(HasSubstr("isk is not a valid memory size"))); // note single dash
+}
+
 TEST_F(Client, launch_cmd_help_ok)
 {
     EXPECT_THAT(send_command({"launch", "-h"}), Eq(mp::ReturnCode::Ok));