Merge "ssh.py: add flag to request for a pseudo terminal (pty) for ssh connection"

[yardstick.git] / yardstick / dispatcher / http.py

diff --git a/yardstick/dispatcher/http.py b/yardstick/dispatcher/http.py
index f84ad09..98e772d 100644 (file)
--- a/yardstick/dispatcher/http.py
+++ b/yardstick/dispatcher/http.py
@@ -1,11 +1,20 @@
-##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+# Copyright 2013 IBM Corp
+# All Rights Reserved.
 #
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+# yardstick comment: this is a modified copy of
+# ceilometer/ceilometer/dispatcher/http.py
 
 import os
 import json
@@ -72,14 +81,14 @@ class HttpDispatcher(DispatchBase):
                 case_name = v["scenario_cfg"]["tc"]
                 break
         if case_name == "":
-            LOG.error('Test result : %s' % json.dumps(self.result))
+            LOG.error('Test result : %s', json.dumps(self.result))
             LOG.error('The case_name cannot be found, no data will be posted.')
             return
 
         self.result["case_name"] = case_name
 
         try:
-            LOG.debug('Test result : %s' % json.dumps(self.result))
+            LOG.debug('Test result : %s', json.dumps(self.result))
             res = requests.post(self.target,
                                 data=json.dumps(self.result),
                                 headers=self.headers,