Merge pull request #6 from cisco-ie/development

Apply license

Author: remingtonc

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 Cisco Systems
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

nxos_grpc/__init__.py

@@ -1,16 +1,15 @@
-"""
-   Copyright 2018 Cisco Systems
+"""Copyright 2019 Cisco Systems
 
-   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
+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
+    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.
+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.
 """
 from .client import Client

nxos_grpc/client.py

@@ -1,6 +1,18 @@
+"""Copyright 2019 Cisco Systems
+
+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.
+"""
 """NX-OS gRPC Python wrapper library
-Copyright 2018 Cisco Systems
-Apache v2 Licensed
 Function usage derived from example NX-OS client from Kyoung Yun. Thanks :)
 TODO: Write session state management wrapper.
 TODO: Make individual returns more useful?

nxos_grpc/response.py

@@ -1,3 +1,17 @@
+"""Copyright 2019 Cisco Systems
+
+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.
+"""
 """Generic response wrapper class.
 All responses follow the same data return format,
 so generalizing the data return structure. Formalizes
@@ -7,6 +21,7 @@
 TODO: Simplify?
 """
 import json
+import logging
 
 
 def build_response(reqid, response_stream):
@@ -37,7 +52,10 @@ def build_response(reqid, response_stream):
     response_obj = gRPCResponse(reqid)
     for response in response_stream:
         response_obj.add_data(response.ReqID, response.YangData, response.Errors)
-    response_obj.finalize()
+    try:
+        response_obj.finalize()
+    except json.decoder.JSONDecodeError:
+        logging.exception('Error finalizing response JSON! Returning potentially un-finalized elements.')
     return response_obj
 
 

sample.py

@@ -1,4 +1,18 @@
 #!/usr/bin/env python
+"""Copyright 2019 Cisco Systems
+
+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 json
 import logging
 from nxos_grpc import Client

setup.py

@@ -1,6 +1,21 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+"""Copyright 2019 Cisco Systems
+
+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.
+"""
+
 # Adapted from https://github.com/kennethreitz/setup.py
 # Note: To use the 'upload' functionality of this file, you must:
 #   $ pip install twine