X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vnfs%2FVES5.0%2Fevel%2Fevel-test-collector%2Fcode%2Fcollector%2Ftest_control.py;h=5d7394e152a8c85d79ca9f7951c0ea4c292c3bc9;hb=refs%2Fchanges%2F33%2F104233%2F1;hp=e2ce8163b597af3293d9ea82e42bcb43ae330b48;hpb=fee6de844f9d4c3aad87733734d35df50117b6b0;p=demo.git

diff --git a/vnfs/VES5.0/evel/evel-test-collector/code/collector/test_control.py b/vnfs/VES5.0/evel/evel-test-collector/code/collector/test_control.py
index e2ce8163..5d7394e1 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/code/collector/test_control.py
+++ b/vnfs/VES5.0/evel/evel-test-collector/code/collector/test_control.py
@@ -7,37 +7,24 @@ Only intended for test purposes.
 License
 -------
 
-Copyright(c) <2016>, AT&T Intellectual Property.  All other rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgement:  This product includes
-   software developed by the AT&T.
-4. Neither the name of AT&T nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY AT&T INTELLECTUAL PROPERTY ''AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL AT&T INTELLECTUAL PROPERTY BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ===================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ * 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.
+
 '''
 import optparse
 import requests
-import json
 
 ###############################################################################
 # Functions to build up commandList contents
@@ -56,9 +43,9 @@ def command_interval(interval):
 def command_throttle(domain, fields, pairs):
     "return a throttlingSpecification"
     throttle_spec = {'eventDomain' : domain}
-    if len(fields):
+    if fields:
         throttle_spec['suppressedFieldNames'] = fields
-    if len(pairs):
+    if pairs:
         throttle_spec['suppressedNvPairsList'] = pairs
     return {'command':
             {'commandType': 'throttlingSpecification',