Merge ~codersquid/checkbox-ng:update-certification-url-again into checkbox-ng:master

[Sheila Miguez]

Correct the /api/v1/submission url.

Correct the /api/v1/submission url. It should use 'submission' not 'submissions'.

[Sheila Miguez (codersquid)]

I've updated c3 to support either URL.

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/checkbox_ng/launcher/subcommands.py b/checkbox_ng/launcher/subcommands.py
index b938fb4..266ffb4 100644
--- a/checkbox_ng/launcher/subcommands.py
+++ b/checkbox_ng/launcher/subcommands.py
@@ -94,10 +94,10 @@ class Submit(Command):
         mode = 'rb'
         options_string = "secure_id={0}".format(ctx.args.secure_id)
         url = ('https://certification.canonical.com/'
-               'api/v1/submissions/{}/'.format(ctx.args.secure_id))
+               'api/v1/submission/{}/'.format(ctx.args.secure_id))
         if ctx.args.staging:
             url = ('https://certification.staging.canonical.com/'
-                   'api/v1/submissions/{}/'.format(ctx.args.secure_id))
+                   'api/v1/submission/{}/'.format(ctx.args.secure_id))
         if ctx.args.submission.endswith('xml'):
             from checkbox_ng.certification import CertificationTransport
             transport_cls = CertificationTransport
@@ -679,10 +679,10 @@ class Launcher(Command, MainLoopStage):
                 options = ""
             if self.launcher.transports[transport].get('staging', False):
                 url = ('https://certification.staging.canonical.com/'
-                       'api/v1/submissions/{}/'.format(secure_id))
+                       'api/v1/submission/{}/'.format(secure_id))
             else:
                 url = ('https://certification.canonical.com/'
-                       'api/v1/submissions/{}/'.format(secure_id))
+                       'api/v1/submission/{}/'.format(secure_id))
             self.transports[transport] = cls(url, options)
 
     def _export_results(self):