Merge pull request #895 from ygorelik/0.8.2

Merging branch 0.8.2 to master

.travis.yml

@@ -4,38 +4,38 @@ language: python
 
 matrix:
   include:
-   - os: linux
-     dist: trusty
-     group: edge
+#   - os: linux
+#     dist: trusty
+#     group: edge
    - os: osx
-     osx_image: xcode7.3
+     osx_image: xcode8.3
      language: generic
-#   - os: osx
-#     env: GNMI=true
-#     osx_image: xcode7.3
-#     language: generic
-   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=2.7
-   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=2.7 GNMI=true
-   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=3.6
-   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=3.6 GNMI=true
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=2.7
+   - os: osx
+     env: GNMI=true
+     osx_image: xcode8.3
+     language: generic
+#   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=2.7
+#   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=2.7 GNMI=true
+#   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=3.6
+#   - env: DOCKER=true OS_TYPE=centos OS_VERSION=centos7 PYTHON_VERSION=3.6 GNMI=true
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=2.7
 #   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=2.7 GNMI=true
 #   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=3.5
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=3.5 GNMI=true
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=2.7
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=2.7 GNMI=true
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=3
-   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=3 GNMI=true
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=xenial  PYTHON_VERSION=3.5 GNMI=true
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=2.7
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=2.7 GNMI=true
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=3
+#   - env: DOCKER=true OS_TYPE=ubuntu OS_VERSION=bionic  PYTHON_VERSION=3 GNMI=true
   allow_failures:
    - os: osx
 
 services:
   - docker
 
 before_install:
-    - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update  ; fi
+#    - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
     - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install curl doxygen xml2  ; fi
-    - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/dependencies_osx.sh      ; fi
+    - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/dependencies_osx.sh ; fi
     - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$GNMI" == "true" ]]; then ./test/dependencies_osx_gnmi.sh ; fi
     - if [[ "$DOCKER" != "true" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/dependencies_trusty.sh ; fi
     - if [[ "$DOCKER" == "true" ]]; then docker pull ${OS_TYPE}:${OS_VERSION}                                ; fi

CHANGES.md

@@ -1,3 +1,26 @@
+### 2019-03-15 version 0.8.2
+
+#### New features and enhancements
+  * Expanded disabling of data validation to read operations with NetconfServiceProvider.
+  * Expanded disabling of data validation to gNMIServiceProvider.
+
+#### Resolved GitHub issues
+  * ydk-py and ydk-gen Travis tests fail on Mac ([#834](https://github.com/CiscoDevNet/ydk-gen/issues/834))
+  * When MacOS is updated from Homebrew any Python2 YDK application fails ([#837](https://github.com/CiscoDevNet/ydk-gen/issues/837))
+  * ImportError: dynamic module does not define module export function (PyInit_ydk_) ([#840](https://github.com/CiscoDevNet/ydk-gen/issues/840))
+  * Libyang error: Reached limit (65535) for storing typedefs ([#874](https://github.com/CiscoDevNet/ydk-gen/issues/874))
+  * AttributeError: 'Config' object has no attribute 'logger' ([#876](https://github.com/CiscoDevNet/ydk-gen/issues/876))
+  * Segmentation Fault in API when connection to Netconf fails ([#879](https://github.com/CiscoDevNet/ydk-gen/issues/879))
+  * gNMI provider requires 'port' argument ([#880](https://github.com/CiscoDevNet/ydk-gen/issues/880))
+  * 'delete' and 'replace' filters do not work properly with gNMI and CRUD service ([#881](https://github.com/CiscoDevNet/ydk-gen/issues/881))
+  * Go compiler failed to link gNMI service on Mac ([#892](https://github.com/CiscoDevNet/ydk-gen/issues/892))
+
+#### Model bundle additions
+  * Released cisco-ios-xr bundle to support Cisco IOS XR 6.5.2
+  * Released cisco-ios-xe bundle to support Cisco IOS XE 16.9.3
+  * Released cisco-nx-os bundle to support Cisco NX OS 9.2.3
+
+
 ### 2019-02-11 version 0.8.1
 
 #### Python, C++, Go
@@ -21,7 +44,7 @@
   * Decoding gNMI payload fails with ValueError exception ([#858](https://github.com/CiscoDevNet/ydk-gen/issues/858))
 
 #### Documentation improvements
-  Addressed multiple documentation issues: [#848](https://github.com/CiscoDevNet/ydk-gen/issues/848), 
+  Addressed multiple documentation issues: [#848](https://github.com/CiscoDevNet/ydk-gen/issues/848),
   [#850](https://github.com/CiscoDevNet/ydk-gen/issues/850), [#861](https://github.com/CiscoDevNet/ydk-gen/issues/861),
   [#862](https://github.com/CiscoDevNet/ydk-gen/issues/862)
 
@@ -38,7 +61,7 @@
 
 #### ydk-gen
   * Added capability to generate YDK service packages from `generate.py` script.
-  
+
 ### 2018-10-02 version 0.7.3
 
 ### Python, C++ and Go
@@ -82,7 +105,7 @@ CRUD/ NETCONF / Codec API improvements
 ```
 
 ### 2018-07-02 version 0.7.2
- 
+
 #### Bundle improvements
   * Released [`cisco-nx-os`](https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-nx-os-0_7_4.json) bundle to support Cisco NX OS 7.0-3-I7-4 release
   * Updated [`cisco-ios-xr`](https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_4_1.json) bundle to support Cisco IOS XR 6.4.1 release
@@ -107,7 +130,7 @@ CRUD/ NETCONF / Codec API improvements
   * Fixed issue with mixed case objects in Go language model API ([#686](https://github.com/CiscoDevNet/ydk-gen/issues/686))
 
 ### 2018-04-09 version 0.7.1
- 
+
 #### Python, C++ and Go
 
 ##### Bundle improvements
@@ -157,7 +180,7 @@ CRUD/ NETCONF / Codec API improvements
   * [#673](https://github.com/CiscoDevNet/ydk-gen/pull/673), [#663](https://github.com/CiscoDevNet/ydk-gen/pull/), [#660](https://github.com/CiscoDevNet/ydk-gen/pull/660), [#658](https://github.com/CiscoDevNet/ydk-gen/pull/658), [#606](https://github.com/CiscoDevNet/ydk-gen/pull/606), [#605](https://github.com/CiscoDevNet/ydk-gen/pull/605)
 
 ##### CRUD service improvements
-  * Fixed handling of reading operational data nodes ([#664](https://github.com/CiscoDevNet/ydk-gen/issues/664)) 
+  * Fixed handling of reading operational data nodes ([#664](https://github.com/CiscoDevNet/ydk-gen/issues/664))
   * Improved formatting of payloads in logging output ([#670](https://github.com/CiscoDevNet/ydk-gen/issues/670))
 
 ##### Error handling improvements
@@ -210,7 +233,7 @@ CRUD/ NETCONF / Codec API improvements
    * Decoupled path API-specific details from Service Provider and created Netconf & Restconf Session to be used instead of Provider in path API ([#494](https://github.com/CiscoDevNet/ydk-gen/issues/494), [#511](https://github.com/CiscoDevNet/ydk-gen/issues/511))
    * Fixed segmentation fault with the `openconfig-platform` model ([#527](https://github.com/CiscoDevNet/ydk-gen/issues/527))
  * Improved Netconf Service's `kill_session` method ([#528](https://github.com/CiscoDevNet/ydk-gen/issues/528))
- 
+
 #### Documentation
  * Fixed documentation issues for installation ([#529](https://github.com/CiscoDevNet/ydk-gen/issues/529), [#531](https://github.com/CiscoDevNet/ydk-gen/issues/531), [#542](https://github.com/CiscoDevNet/ydk-gen/issues/542), [#541](https://github.com/CiscoDevNet/ydk-gen/issues/541))
  * Improved API documentation ([#424](https://github.com/CiscoDevNet/ydk-gen/issues/424), [#94](https://github.com/CiscoDevNet/ydk-gen/issues/94))
@@ -351,7 +374,7 @@ The [backward incompatible](http://ydk.cisco.com/py/docs/backward_compatibility.
   * Made generate.py executable ([#227](https://github.com/CiscoDevNet/ydk-gen/issues/227))
   * Removed auto capitalization of enum literals ([#230](https://github.com/CiscoDevNet/ydk-gen/issues/230))
   * Updated [`cisco-ios-xr` bundle](https://github.com/CiscoDevNet/ydk-gen/blob/master/profiles/bundles/cisco-ios-xr_6_1_2.json) to support Cisco IOS XR 6.1.2 release ([#316](https://github.com/CiscoDevNet/ydk-gen/pull/316))
-  
+
 * Logging improvements
   * Improved logging for services and providers ([#251](https://github.com/CiscoDevNet/ydk-gen/issues/251), [#254](https://github.com/CiscoDevNet/ydk-gen/issues/254), [#280](https://github.com/CiscoDevNet/ydk-gen/issues/280), [#283](https://github.com/CiscoDevNet/ydk-gen/issues/283), [#284](https://github.com/CiscoDevNet/ydk-gen/issues/284))
 
@@ -451,7 +474,7 @@ The [backward incompatible](http://ydk.cisco.com/py/docs/backward_compatibility.
   * Logging made more consistent
     * CRUDService outputs type of operation
     * When logging is enabled, all NETCONF messages are logged including commit
-    * Log messages at various stages (send RPC request, receive reply, commit 
+    * Log messages at various stages (send RPC request, receive reply, commit
       etc) instead of logging all at once at the end
   * Updated enums in YDK classes to use enum34
     * Improved enum documentation

README.md

@@ -20,7 +20,7 @@ YANG Development Kit (Generator)
   - [MacOS](#macos)
   - [Windows](#windows)
 - [Installation](#installation)
-  - [Setting up your environment](#setting-up-your-environment)
+  - [Setting up Python virtual environment](#setting-up-python-virtual-environment)
   - [Clone ydk-gen and install the requirements](#clone-ydk-gen-and-install-the-requirements)
 - [Generate YDK components](#generate-ydk-components)
   - [First step: choose model bundle profile](#first-step-choose-model-bundle-profile)
@@ -61,7 +61,7 @@ The output of ydk-gen is either a core package, that defines services and provid
 
 # Backward compatibility
 
-The YDK-0.8.1 core is bacward compatible with generated in YDK-0.7.3 model bundle code. It is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling of YList objects.
+The YDK-0.8.2 core is backward compatible with generated in YDK-0.7.3 model bundle code. It is not compatible with YDK-0.7.2 and earlier bundle packages due to changes in modeling and handling of YList objects.
 
 # Docker
 
@@ -100,15 +100,15 @@ You can install the latest `libydk` core library using prebuilt binaries for Xen
 For Xenial (Ubuntu 16.04.4):
 
 ```
-   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.1/xenial/libydk_0.8.1-1_amd64.deb
-   sudo gdebi libydk_0.8.1-1_amd64.deb
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.2/xenial/libydk-0.8.2-1.amd64.deb
+   sudo gdebi libydk-0.8.2-1.amd64.deb
 ```
 
 For Bionic (Ubuntu 18.04.1):
 
 ```
-   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.1/bionic/libydk_0.8.1-1_amd64.deb
-   sudo gdebi libydk_0.8.1-1_amd64.deb
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.2/bionic/libydk-0.8.2-1.amd64.deb
+   sudo gdebi libydk-0.8.2-1.amd64.deb
 ```
 
 ### Centos (Fedora-based)
@@ -129,7 +129,7 @@ For Bionic (Ubuntu 18.04.1):
 #### Install prebuilt libydk binary
 
 ```  
-   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.1/libydk-0.8.1-1.x86_64.rpm
+   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.2/libydk-0.8.2-1.x86_64.rpm
 ```
 
 ### Build from source
@@ -154,20 +154,18 @@ Install dependencies OS dependencies then generate and install YDK C++ libraries
 
 It is recommended to install [homebrew](http://brew.sh) and Xcode command line tools on your system before installing YDK-Py/YDK-Cpp/YDK-Go.
 
-You can download the latest Python package from [here](https://www.python.org/downloads/). Please do not use the homebrew version of Python as it causes issues with installation of YDK packages. Please execute `brew rm python python3` to remove any homebrew Python packages.
-
-#### Install prebuilt libydk and optionally libydk_gnmi libraries
+### Install prebuilt libydk and optionally libydk_gnmi libraries
 
 ```
    xcode-select --install
    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
    brew install pkg-config libssh xml2 curl pcre cmake libxml2 pybind11
    
-   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.1/libydk-0.8.1-Darwin.pkg
-   sudo installer -pkg libydk-0.8.1-Darwin.pkg -target /
+   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.2/libydk-0.8.2-Darwin.pkg
+   sudo installer -pkg libydk-0.8.2-Darwin.pkg -target /
 
-   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.1/libydk_gnmi-0.4.0-1_Darwin.pkg
-   sudo installer -pkg libydk_gnmi-0.4.0-1_Darwin.pkg -target /
+   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.2/libydk_gnmi-0.4.0-2_Darwin.pkg
+   sudo installer -pkg libydk_gnmi-0.4.0-2_Darwin.pkg -target /
 ```
 
 ### Build from source
@@ -241,28 +239,28 @@ In order to enable YDK support for gNMI protocol, which is optional, the followi
 For Xenial (Ubuntu 16.04.4):
 
 ```
-   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.1/xenial/libydk_gnmi_0.4.0-1_amd64.deb
-   sudo gdebi libydk_gnmi_0.4.0-1_amd64.deb
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.2/xenial/libydk_gnmi_0.4.0-2_amd64.deb
+   sudo gdebi libydk_gnmi_0.4.0-2_amd64.deb
 ```
 
 For Bionic (Ubuntu 18.04.1)
 
 ```
-   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.1/bionic/libydk_gnmi_0.4.0-1_amd64.deb
-   sudo gdebi libydk_gnmi_0.4.0-1_amd64.deb
+   wget https://devhub.cisco.com/artifactory/debian-ydk/0.8.2/bionic/libydk_gnmi_0.4.0-2_amd64.deb
+   sudo gdebi libydk_gnmi_0.4.0-2_amd64.deb
 ```
 
 #### CentOS
 
 ```
-   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.1/libydk_gnmi_0.4.0-1.x86_64.rpm
+   sudo yum install https://devhub.cisco.com/artifactory/rpm-ydk/0.8.2/libydk_gnmi_0.4.0-2.x86_64.rpm
 ```
 
 #### MacOS:
 
 ```
-   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.1/libydk_gnmi-0.4.0-1_Darwin.pkg
-   sudo installer -pkg libydk_gnmi-0.4.0-1_Darwin.pkg -target /
+   curl -O https://devhub.cisco.com/artifactory/osx-ydk/0.8.2/libydk_gnmi-0.4.0-2_Darwin.pkg
+   sudo installer -pkg libydk_gnmi-0.4.0-2_Darwin.pkg -target /
 ```
 
 ### Run-time environment
@@ -277,7 +275,7 @@ As a workaround, the YDK based application runtime environment must include sett
 ```
 
 # Installation
-## Setting up your environment
+## Setting up Python virtual environment
 
 We recommend that you run ydk-gen under Python virtual environment (``virtualenv``/``virtualenvwrapper``).  To install Python virtual environment in your system, execute:
 
@@ -288,12 +286,24 @@ We recommend that you run ydk-gen under Python virtual environment (``virtualenv
 
 In some systems (e.g. Debian-based Linux), you may need to install support for Python virtual environments as root
 
-Create new virtual environment:
+Create and activate new virtual environment:
 
 ```
    mkvirtualenv -p python2.7 py2
 ```
 
+Activate previously created virtusl environment:
+
+```
+   source ~/.virtualenvs/py2/bin/activate
+```
+
+Exit virtual environment:
+
+```
+   deactivate
+```
+
 ## Clone ydk-gen and install the requirements
 
 ```
@@ -359,7 +369,7 @@ A sample bundle profile file is described below. The file is in a JSON format. S
 {
     "name":"cisco-ios-xr",
     "version": "0.1.0",
-    "ydk_version": "0.8.1",
+    "ydk_version": "0.8.2",
     "Author": "Cisco",
     "Copyright": "Cisco",
     "Description": "Cisco IOS-XR Native Models From Git",
@@ -458,7 +468,7 @@ Now, the `pip list | grep ydk` should show the `ydk` (referring to the core pack
 $ pip list | grep ydk
 ...
 
-ydk (0.8.1)
+ydk (0.8.2)
 ydk-models-<name-of-bundle> (0.5.1)
 ...
 ```
@@ -536,6 +546,12 @@ It is also required for Python installation to include corresponding shared libr
 
 Please follow [System requirements](#system-requirements) to assure presence of shared Python libraries.
 
+### Mac OS
+
+The developers of Python2 on Mac OS might face an issue ([#837](https://github.com/CiscoDevNet/ydk-gen/issues/837)). 
+This is well known and documented issue. Each developer might have different approaches for its resolution. 
+One of them is to use Python2 virtual environment. See [Setting up Python virtual environment](#setting-up-python-virtual-environment) for details.
+
 ## Directory structure
 
 ```
@@ -618,10 +634,10 @@ $ cmake .. && make all test
 
 Please refer [here](https://github.com/CiscoDevNet/ydk-gen/blob/master/sdk/go/core/README.md).
 
-Support
-=======
+#### Support
+
 Join the [YDK community](https://communities.cisco.com/community/developer/ydk) to connect with other users and with the makers of YDK.
 
-Release Notes
-===============
-The current YDK release version is 0.8.1. The version of the latest YDK-Gen master branch is 0.8.1. YDK-Gen is licensed under the Apache 2.0 License.
+#### Release Notes
+
+The current YDK release version is 0.8.2. The version of the latest YDK-Gen master branch is 0.8.2. YDK-Gen is licensed under the Apache 2.0 License.

generate_bundles.sh

@@ -99,24 +99,24 @@ run_cmd ./generate.py --core
 run_cmd ./generate.py --service profiles/services/gnmi-0.4.0_post1.json
 run_cmd ./generate.py --bundle profiles/bundles/ietf_0_1_5_post2.json
 run_cmd ./generate.py --bundle profiles/bundles/openconfig_0_1_6_post1.json
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_1.json
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_1_post1.json
-run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_2.json
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_3.json
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_2.json
+run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_3.json
 
 print_msg "Generating C++ core and bundles"
 run_cmd ./generate.py --core --cpp
 run_cmd ./generate.py --service profiles/services/gnmi-0.4.0_post1.json --cpp
 run_cmd ./generate.py --bundle profiles/bundles/ietf_0_1_5_post2.json --cpp
 run_cmd ./generate.py --bundle profiles/bundles/openconfig_0_1_6_post1.json --cpp
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_1.json --cpp
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_1_post1.json  --cpp
-run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_2.json  --cpp
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_3.json --cpp
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_2.json  --cpp
+run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_3.json  --cpp
 
 print_msg "Generating Go core and bundles"
 run_cmd ./generate.py --core --go
 run_cmd ./generate.py --service profiles/services/gnmi-0.4.0_post1.json --go
 run_cmd ./generate.py --bundle profiles/bundles/ietf_0_1_5_post2.json --go
 run_cmd ./generate.py --bundle profiles/bundles/openconfig_0_1_6_post1.json --go
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_1.json --go
-run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_1_post1.json  --go
-run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_2.json --go
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xe_16_9_3.json --go
+run_cmd ./generate.py --bundle profiles/bundles/cisco-ios-xr_6_5_2.json  --go
+run_cmd ./generate.py --bundle profiles/bundles/cisco-nx-os-9_2_3.json --go