Rebased core tests

.gitignore

@@ -3,6 +3,7 @@
 .pydevproject
 .project
 .externalToolBuilders/
+.temp
 *.pyc
 *~
 *.swp
@@ -40,3 +41,5 @@ sdk/cpp/netconf_client.o
 sdk/cpp/tests/ydk_test
 sdk/cpp/ydk_client.so
 
+*.sublime-project
+*.sublime-workspace

.travis.yml

@@ -1,32 +1,19 @@
 sudo: required
 
-services:
-    - docker
-
-os:
-    - linux
-    - osx
+matrix:
+    include:
+        - os: linux
+          dist: trusty
+          language: python
+          python: 2.7
+        - os: osx
+          language: generic
 
 before_install:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update && sudo apt-get install -y python-pip zlib1g-dev python-lxml libxml2-dev libxslt1-dev python-dev libboost-dev libboost-python-dev libssh-dev libcurl4-openssl-dev libtool python3-lxml; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install jq ; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$PATH:~/Library/Python; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ydkdev/confd-beta; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update                    ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3           ; fi
 
 script:
-    - export PR=https://api.github.com/repos/$TRAVIS_REPO_SLUG/pulls/$TRAVIS_PULL_REQUEST
-    - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo `curl -s $PR | jq -r .head.ref`; fi)
-    - export REPO=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_REPO_SLUG; else echo `curl -s $PR | jq -r .head.repo.full_name`; fi)
-    - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH, REPO=$REPO"
-    - ./test/osx_linux_tests.sh --gen_py_version python2.7 --test_py_version python2.7
-    - ./test/osx_linux_tests.sh --gen_py_version python2.7 --test_py_version python3.4
-    - ./test/osx_linux_tests.sh --gen_py_version python3.4 --test_py_version python2.7
-    - ./test/osx_linux_tests.sh --gen_py_version python3.4 --test_py_version python3.4
-
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -v $PWD/test/:/root/test/ ydkdev/confd-beta /root/test/travis_ci.sh --repo https://github.com/$REPO.git --branch $BRANCH --gen_py_version python2.7 --test_py_version python2.7; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -v $PWD/test/:/root/test/ ydkdev/confd-beta /root/test/travis_ci.sh --repo https://github.com/$REPO.git --branch $BRANCH --gen_py_version python2.7 --test_py_version python3.4; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -v $PWD/test/:/root/test/ ydkdev/confd-beta /root/test/travis_ci.sh --repo https://github.com/$REPO.git --branch $BRANCH --gen_py_version python3.4 --test_py_version python2.7; fi
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -v $PWD/test/:/root/test/ ydkdev/confd-beta /root/test/travis_ci.sh --repo https://github.com/$REPO.git --branch $BRANCH --gen_py_version python3.4 --test_py_version python3.4; fi
-
-
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./test/dependencies_osx.sh     ; fi
+    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./test/dependencies_linux.sh ; fi
+    - sudo ./test/tests.sh

generate.py

@@ -21,9 +21,11 @@
 import fileinput
 import logging
 import os
+import shutil
 import subprocess
 import sys
 import time
+import re
 
 from git import Repo
 from ydkgen import YdkGenerator
@@ -52,18 +54,23 @@ def print_about_page(ydk_root, py_api_doc_gen, release, is_bundle):
     # modify about_ydk.rst page
     for line in fileinput.input(os.path.join(py_api_doc_gen, 'about_ydk.rst'), 'r+w'):
         if 'git clone repo-url' in line:
-            print(line.replace('repo-url', 'https://{0}.git'.format(url)), end=' ')
+            print(line.replace('repo-url', 'https://{0}.git'.format(url)), end='')
         elif 'git checkout commit-id' in line:
-            print(line.replace('commit-id', '{}'.format(commit_id)))
+            print(line.replace('commit-id', '{}'.format(commit_id)), end='')
         elif 'version-id' in line:
-            print(line.replace('version-id', '{}'.format(release.replace('release=', ''))))
+            print(line.replace('version-id', '{}'.format(release.replace('release=', ''))), end='')
         else:
-            print(line, end=' ')
+            print(line, end='')
 
 
-def get_release_version(output_directory):
-    version = ''
-    release = ''
+def get_release_version(output_directory, language):
+    if language == 'python':
+        return get_py_release_version(output_directory)
+    elif language == 'cpp':
+        return get_cpp_release_version(output_directory)
+
+
+def get_py_release_version(output_directory):
     setup_file = os.path.join(output_directory, 'setup.py')
     with open(setup_file, 'r') as f:
         for line in f:
@@ -74,7 +81,30 @@ def get_release_version(output_directory):
                 release = "release=" + rv
                 version = "version=" + rv
                 break
-    return release, version
+    return (release, version)
+
+
+def get_cpp_release_version(output_directory):
+    MAJOR_VERSION = re.compile(r"set\(YDK_[A-Z]*[_]*MAJOR_VERSION (?P<num>\d+)\)")
+    MINOR_VERSION = re.compile(r"set\(YDK_[A-Z]*[_]*MINOR_VERSION (?P<num>\d+)\)")
+    SERVICE_VERSION = re.compile(r"set\(YDK_[A-Z]*[_]*SERVICE_VERSION (?P<num>\d+)\)")
+    major_version, minor_version, service_version = 0, 0, 0
+    cmake_file = os.path.join(output_directory, 'CMakeLists.txt')
+    with open(cmake_file) as f:
+        for line in f:
+            major_match = MAJOR_VERSION.match(line)
+            minor_match = MINOR_VERSION.match(line)
+            service_match = SERVICE_VERSION.match(line)
+            if major_match:
+                major_version = major_match.group('num')
+            if minor_match:
+                minor_version = minor_match.group('num')
+            if service_match:
+                service_version = service_match.group('num')
+    version = "%s.%s.%s" % (major_version, minor_version, service_version)
+    release = "release=%s" % version
+    version = "version=%s" % version
+    return (release, version)
 
 
 def copy_docs_from_bundles(ydk_root, language, destination_dir):
@@ -106,7 +136,7 @@ def generate_documentations(output_directory, ydk_root, language, is_bundle, is_
     py_api_doc_gen = os.path.join(output_directory, 'docsgen')
     py_api_doc = os.path.join(output_directory, 'docs_expanded')
     # if it is package type
-    release, version = get_release_version(output_directory)
+    release, version = get_release_version(output_directory, language)
     os.mkdir(py_api_doc)
     # print about YDK page
     print_about_page(ydk_root, py_api_doc_gen, release, is_bundle)
@@ -137,7 +167,7 @@ def create_pip_packages(output_directory):
 
     if exit_code == 0:
         print('\nSuccessfully created source distribution at %s/dist' %
-              (py_sdk_root,))
+              py_sdk_root)
     else:
         print('\nFailed to create source distribution')
         sys.exit(exit_code)
@@ -147,22 +177,25 @@ def create_pip_packages(output_directory):
         py_sdk_root,))
 
 
-def create_shared_libraries(output_directory):
-    cpp_sdk_root = output_directory
-    os.chdir(cpp_sdk_root)
-    args = ['make']
-    exit_code = subprocess.call(args, env=os.environ.copy())
-
-    if exit_code == 0 and os.path.isfile(
-                            os.path.join(cpp_sdk_root, 'ydk_cpp.so')):
-        print('\nSuccessfully created shared library %s as ydk_cpp.so' %
-              (cpp_sdk_root))
-    else:
+def create_shared_libraries(output_directory, sudo):
+    cpp_sdk_root = os.path.join(output_directory)
+    cmake_build_dir = os.path.join(output_directory, 'build')
+    if os.path.exists(cmake_build_dir):
+        shutil.rmtree(cmake_build_dir)
+    os.makedirs(cmake_build_dir)
+    os.chdir(cmake_build_dir)
+    sudo_cmd = 'sudo' if sudo else ''
+    try:
+        subprocess.check_call(['%s' % sudo_cmd, 'cmake', '..'])
+        subprocess.check_call(['%s' % sudo_cmd, 'make', '-j5'])
+        subprocess.check_call(['%s' % sudo_cmd, 'make', 'install'])
+    except subprocess.CalledProcessError as e:
         print('\nERROR: Failed to create shared library!\n')
-        sys.exit(exit_code)
+        sys.exit(e.returncode)
+    print('\nSuccessfully created and installed shared libraries')
     print('\n=================================================')
     print('Successfully generated C++ YDK at %s' % (cpp_sdk_root,))
-    print('Please read %sREADME.rst for information on how to install the package in your environment\n' % (
+    print('Please read %s/README.rst for information on how to install the package in your environment\n' % (
         cpp_sdk_root,))
 
 
@@ -238,6 +271,12 @@ def _get_time_taken(start_time):
                       default=False,
                       help="Consider yang groupings as classes.")
 
+    parser.add_option("--sudo",
+                      action="store_true",
+                      dest="sudo",
+                      default=False,
+                      help="Use sudo for C++ core library installation.")
+
     try:
         arg = sys.argv[1]
     except IndexError:
@@ -267,43 +306,45 @@ def _get_time_taken(start_time):
     elif options.python:
         language = 'python'
 
-
     if options.profile:
         output_directory = (YdkGenerator(
-                           output_directory,
-                           ydk_root,
-                           options.groupings_as_class,
-			               options.gentests,
-                           language,
-                           'profile').generate(options.profile))
+                            output_directory,
+                            ydk_root,
+                            options.groupings_as_class,
+                            options.gentests,
+                            language,
+                            'profile').generate(options.profile))
 
     elif options.bundle:
         output_directory = (YdkGenerator(
-                           output_directory,
-                           ydk_root,
-                           options.groupings_as_class,
-			               options.gentests,
-                           language,
-                           'bundle').generate(options.bundle))
-
-    elif options.core:
+                            output_directory,
+                            ydk_root,
+                            options.groupings_as_class,
+                            options.gentests,
+                            language,
+                            'bundle').generate(options.bundle))
+
+    if options.core:
         output_directory = (YdkGenerator(
-                           output_directory,
-                           ydk_root,
-                           options.groupings_as_class,
-                           options.gentests,
-                           language,
-                           'core').generate())
-
+                            output_directory,
+                            ydk_root,
+                            options.groupings_as_class,
+                            options.gentests,
+                            language,
+                            'core').generate())
 
     if options.gendoc:
         generate_documentations(output_directory, ydk_root, language, options.bundle, options.core)
 
+    minutes_str, seconds_str = _get_time_taken(start_time)
+    print('\nTime taken for code/doc generation: {0} {1}\n'.format(minutes_str, seconds_str))
+    print('\nPerforming compilation and/or installation...\n')
+
     if options.cpp:
-        create_shared_libraries(output_directory)
+        create_shared_libraries(output_directory, options.sudo)
     else:
         create_pip_packages(output_directory)
 
     minutes_str, seconds_str = _get_time_taken(start_time)
-    print('Code generation completed successfully!')
-    print('Time taken: {0} {1}\n'.format(minutes_str, seconds_str))
+    print('Code generation and installation completed successfully!')
+    print('Total time taken: {0} {1}\n'.format(minutes_str, seconds_str))

profiles/test/deviation/deviation.json → profiles/test/deviation.json

@@ -6,7 +6,7 @@
     "Description": "YDK Test Profile",
     "models": {
     "dir": [
-        "/profiles/test/deviation/yang",
+        "/yang/deviation",
         "/yang/ietf"
         ]
     }

profiles/test/ydktest-cpp.json

@@ -0,0 +1,41 @@
+{
+    "name": "ydktest",
+   "version":"0.1.0",
+   "ydk_version":"0.5.0",
+    "Author": "Cisco",
+    "Copyright": "Cisco",
+    "Description": "YDK Test Profile",
+    "models": {
+	"file": [
+            "sdk/cpp/ydk/tests/models/ietf-interfaces@2014-05-08.yang",
+            "sdk/cpp/ydk/tests/models/main-aug1@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/main-aug2@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/main-aug3@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/main@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-common-multiprotocol.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-common-structure.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-common.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-global.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-neighbor.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-peer-group.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-policy.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp-types.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-bgp.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-extensions.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-interfaces.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-policy-types.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-routing-policy.yang",
+            "sdk/cpp/ydk/tests/models/openconfig-types.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-filterread@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-sanity-augm@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-sanity-submodule@2016-04-25.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-sanity-types@2016-04-11.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-sanity@2015-11-17.yang",
+            "sdk/cpp/ydk/tests/models/ydktest-types@2016-05-23.yang",
+            "yang/ietf/ietf-inet-types@2013-07-15.yang",
+            "yang/ietf/ietf-yang-types@2013-07-15.yang",
+            "yang/ydktest/oc-pattern@2015-11-17.yang"
+        ]
+    }
+}
+

sdk/cpp/.gitignore

@@ -1,2 +1,2 @@
-
+builds