Align fuel2 network-template upload procedure

* removes extra '.yaml' extension from filename
* makes -f/--file option required

Change-Id: If1bfe4d9f68331f76ca748281cbc1f609959573d
Closes-Bug: 1632316

fuelclient/commands/network_template.py

@@ -39,6 +39,7 @@ class NetworkTemplateMixin(object):
     def add_file_argument(parser):
         parser.add_argument(
             '-f', '--file',
+            required=True,
             type=str,
             help='Yaml file containing the network template'
         )

fuelclient/tests/unit/v2/cli/test_network_template.py

@@ -20,13 +20,12 @@ from fuelclient.tests.unit.v2.cli import test_engine
 
 class TestNetworkTemplateCommand(test_engine.BaseCLITest):
 
-    def test_network_template_upload(self):
+    @mock.patch('sys.stderr')
+    def test_network_template_upload_fail(self, mocked_stderr):
         args = 'network-template upload 1'
-        self.exec_command(args)
-
-        self.m_get_client.assert_called_once_with('environment', mock.ANY)
-        self.m_client.upload_network_template.assert_called_once_with(
-            1, None)
+        self.assertRaises(SystemExit, self.exec_command, args)
+        self.assertIn('--file',
+                      mocked_stderr.write.call_args_list[-1][0][0])
 
     def test_network_template_upload_w_file(self):
         args = 'network-template upload --file /tmp/test-file 1'

fuelclient/v1/environment.py

@@ -125,7 +125,6 @@ class EnvironmentClient(base_v1.BaseV1Client):
             file_path=file_path)
         env.set_network_template_data(network_template_data)
 
-        file_path = env.serializer.prepare_path(file_path)
         return file_path
 
     def download_network_template(self, environment_id, directory=None):