summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-03-18Merge "Update oparent-python version for optf/has"Sastry Isukapalli1-1/+1
2018-03-16All compnents on Single docker imageIkram Ikramullah12-179/+533
Made changes to docker settings to make a single image instead of multiple. Also made changes to the run and build scripts to work on this single image. The data component requires certs, keys and ca bundles settings too. For this, made changes to the run script. Also, do to this, added the feature of picking the default values from the current directory if arguments are not provided to the run-docker.scripts. For example: sudo ./run-dockers.sh will run without providing any arguments to it IF the directory from where it is run has these files in it. 1. conductor.conf -- configuration file 2. log.conf -- log settings files 3. aai_cert.cer 4. aai_key.key 5. aai_ca_bunlde.pem (pem) file The first two from the above have been created and provided in the current directory (has/). However, since certs will be different from env to env, the last three needs to be provided either by copying in the current direcotry or as the arguments 3, 4 and 5. The script will give a detailed message on what may be missing and how an attempt was made to get the default files. Checkt it out by playing with run-docker.sh file. Finally, the build script also calls the push script now. Since there can be no testing of this in ONAP artifcats prod BEFORE being merged to master, we can only test the push part once merged to master. Issue-ID: OPTFRA-123 Change-Id: I83c54c97953b71aae18166b937dd89195e705f73 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-03-15Update oparent-python version for optf/hasDileep Ranganathan1-1/+1
Change-Id: Ice973735086d9412220256678b1d0f71ca9ff979 Issue-ID: OPTFRA-184 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-15Merge "Docker dir - removed unused conf file"Shankaranarayanan Puzhavakath Narayanan2-340/+20
2018-03-15Merge "Adding more unit tests and .coveragerc"Sastry Isukapalli3-4/+149
2018-03-14Docker dir - removed unused conf fileIkram Ikramullah2-340/+20
Removed file not needed for docker images. (conductor.conf). Also, added a remove-images.sh to remove images if needed. Issue-ID: OPTFRA-123 Change-Id: I7494a47da268a229d3d6730eb23fd5a5deb27653 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-03-14Merge "Added more unit test cases in aai.py file"Shankaranarayanan Puzhavakath Narayanan3-2/+40
2018-03-13Added more unit test cases in aai.py filerl001m3-2/+40
Added more unit tests for AAI. get_aai_rel_link and get_aai_rel_link_data Usage Change-Id: Ie5bc835013da5333b7e2c6f19f48ad8910793643 Issue-ID: OPTFRA-101 Signed-off-by: rl001m <ruilu@research.att.com>
2018-03-13Corrected Nexus Package contentIkram Ikramullah (ikram@research.att.com)9-201/+54
Before dockerzation can proceed, contents of the package must be correct. Few folders/files were missing. Changed assembly.xml to include all but the ones that are not needed. Also, removed files from conductor/conductor folder that were thought to have contributed to the correction of the package initially. conductor/conductor/README.rst conductor/conductor/README.md conductor/conductor/setup.py conductor/conductor/setup.cfg These files are actually not needed in that level of folder (conductor/condcutor) - They should exist only on the main conductor/ folder. Issue-ID: OPTFRA-123 Change-Id: I006694ddc8e7e5de21ad17fb0d4720c5b19dc960 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-13Merge "Fixed Controller unit tests and UnboundlocalError"Shankaranarayanan Puzhavakath Narayanan4-22/+116
2018-03-13Fixed Controller unit tests and UnboundlocalErrorYing Ruoyu4-22/+116
Fix parse_optimization function in translator.py Defined and initialized variable function in the scope Fix unit test for parse_optimization function Add condition variable in function row_update in api.MockAPI Change-Id: I2f08bcfc001e9ccb22a7315d243006a1995edc81 Issue-ID: OPTFRA-69 Signed-off-by: Ying Ruoyu <ruoyu.ying@intel.com>
2018-03-12Add homing specification guideShankar Narayanan1-0/+1316
Add the homing specification guide in rst format. This should be in sync with doc/template/README.md Issue-ID: OPTFRA-174 Change-Id: I972aa837fe520ade884b8254216bcf5f306e2ff8 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
2018-03-12Add homing specification guideShankar Narayanan2-1/+3
Add the homing specification guide in the rst format. Need to keep this in sync with doc/template/README.md. Issue-ID: OPTFRA-174 Change-Id: I8b16f21d9657838577a8dc5788b522d4577bf190 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
2018-03-12Moved all docker files moved to main folderIkram Ikramullah (ikram@research.att.com)5-8/+8
Issue-ID: OPTFRA-123 Change-Id: I9334bda9ef05ed18c4e1fe35616b53e9ba128dc1 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-12Merge "Add INFO.yaml file"Shankaranarayanan Puzhavakath Narayanan1-0/+47
2018-03-12Add INFO.yaml fileJessica Wagantall1-0/+47
Add INFO.yaml to list: - Project description - Properties - PTL information - Meeting information - Committer information Change-Id: I726b06556d7d2ff1fcde75522e38678eb367aa6d Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2018-03-09Adding more unit tests and .coveragercDileep Ranganathan3-4/+149
Added more unit tests for DataEndpoint class Usage of pragma reverted Change-Id: Id8d4ff76c3ca75a2538352b7eb29b87b1a598794 Issue-ID: OPTFRA-101 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-08Added more unit test cases in data componentrl001m7-55/+240
Modified the test_resolve_demand unit test, and added more test cases for aai.py file. The aai.py test coverage is 72% and total test coverage is 46%. Change-Id: I6e5ea02fc2f32d8ab20830c4bcf40744c59113e2 Issue-ID: OPTFRA-79 Signed-off-by: rl001m <ruilu@research.att.com>
2018-03-07Fixed major bug in sonar reportDileep Ranganathan1-1/+0
Remove or correct variable self-assignment Change-Id: I21204b8c72b0f1890fe1278764da070013c69b34 Issue-ID: OPTFRA-101 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-07Modified unit tests for Controller ModuleYing Ruoyu5-0/+560
Unit test for translator.py, rpc.py and translator_svc.py in conductor/controller Change-Id: I382078152d7708b6946b68902151529dcf1f3be4 Issue-ID: OPTFRA-69 Signed-off-by: Ying Ruoyu <ruoyu.ying@intel.com>
2018-03-08Merge "Fix UnboundlocalError in translator.py"Shankaranarayanan Puzhavakath Narayanan1-0/+1
2018-03-08Merge "Fix unreadable characters in tox tests"Shankaranarayanan Puzhavakath Narayanan1-1/+1
2018-03-08Merge "Added unit test cases for data component"Shankaranarayanan Puzhavakath Narayanan13-14/+315
2018-03-07Added unit test cases for data componentrl001m13-14/+315
Added Python unit test cases for aai.py file in data component. Modified the code in aai.py to make it test-driven. Issue-ID: OPTFRA-79 Change-Id: I5c912c8a13226c6dada921f255a030e798665938 Signed-off-by: rl001m <ruilu@research.att.com>
2018-03-07Merge "Corrected Docker Files"Shankaranarayanan Puzhavakath Narayanan10-29/+105
2018-03-07Corrected Docker FilesIkram Ikramullah (ikram@research.att.com)10-29/+105
Note: we've been running conductor/has using the source distribution (sdist) Running the git glone instead of going for the artifacts - will do the sdist based execution soon once the blocker for functional testing is removed. Also, added push script for docker images. Issue-ID: OPTFRA-123 Change-Id: I733113d217157828322ebc2464351abdc0752be6 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-07Fix unreadable characters in tox testsDileep Ranganathan1-1/+1
Added subunit-trace -f command which was missing Change-Id: I9e1f4f3a3430349ceff3ef3bbe62119468399340 Issue-ID: OPTFRA-164 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-06Fix UnboundlocalError in translator.pyDileep Ranganathan1-0/+1
Defined and initialized variable nested in the scope Change-Id: Idfffc95490f8a11dd0377a8e50a4737e708ecfc7 Issue-ID: OPTFRA-163 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-06Fix Sonar coverage reportDileep Ranganathan6-3/+65
Added maven-exec plugin to trigger tox and coverage Modified sonar properties to set the path to reports Modified .gitignore to add coverage related files Added test dependency junitxml Change-Id: I7e4bb5e4b6bc217b9778350c703d864e9f8ef0e2 Issue-ID: OPTFRA-101 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-05Fix Data module unit testsDileep Ranganathan2-4/+13
New code checkin was breaking the tests. Modified the data module unit tests to fix the breakage. Change-Id: I30b566f771badc4799fdd9a5a946c8c058d2ea6a Issue-ID: OPTFRA-162 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-04Merge "Version.py must match setup.cfg"Shankaranarayanan Puzhavakath Narayanan3-1/+43
2018-03-04Merge "Add Active-Active code to has"Shankaranarayanan Puzhavakath Narayanan38-337/+1635
2018-03-04Version.py must match setup.cfgIkram Ikramullah (ikram@research.att.com)3-1/+43
pip install -e . command was failing due to project name mismatch in version.py (pbr settings) and setup.cfg. Also, README.rst is a required file - must be present in the directory pip install is run from (needed by setup.py). Copied README.rst (and its markdown counterpart - README.md) to one level in (./conductor). Issue-ID: OPTFRA-161 Change-Id: I76e8e9c7d303a1e82524635118af3de36bc1a361 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-04Add Active-Active code to hasIkram Ikramullah38-337/+1635
Added Active-Active setup related files (new and modifications) Issue-ID: OPTFRA-150 Change-Id: I50964ae990a465d0f977a4dea512dd61b35e308d Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-03-02Fixing setup.cfg too like setup.pyIkram Ikramullah (ikram@research.att.com)2-1/+72
Changed email-ids to those of contributors in already existing files (files setup.cf was only copied from one direcotry to another) Issue-ID: OPTFRA-160 Change-Id: Ic87251654d5ffc9db496da40f6dd8d507ac5dcab Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-02Merge "Fixed location for setup.py"Shankaranarayanan Puzhavakath Narayanan1-0/+34
2018-03-02Fixed location for setup.pyIkram Ikramullah (ikram@research.att.com)1-0/+34
Looks like our daily job will fail if setup.py is not where it currently resides (higher folder). But if kept there, pip install wont work since it wont be part of the package created and uploaded. Moving it to both places for now for both items to work. Note: A restructuring is already in the plans to bring this 'multi-module' (so-called) structure to one straight strucutre. In that restucturing setup.py would eventually be in one place anyways. Issue-ID: OPTFRA-160 Change-Id: Ib9ff7a273d6cf1e0c00bb74e562f268e8a569d48 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
2018-03-02Merge "Add API documentation for optf-has"Shankaranarayanan Puzhavakath Narayanan2-0/+134
2018-03-01Added unit tests for Data moduleDileep Ranganathan5-0/+322
Unit test for conductor/data Change-Id: I62e95824a8191adacd630746dc0101660d480886 Issue-ID: OPTFRA-70 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-01Integrate optf/has with SonarDileep Ranganathan2-2/+15
Added sonar properties for python related config Added custom inclusion/exclusion patterns which could be leveraged Change-Id: I3992a9120a30555fc933c1b052984367af69e4da Issue-ID: OPTFRA-101 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-02-28Add API documentation for optf-hasShankar Narayanan2-0/+134
Add the API documentation exposed by HAS, used by OSDF in R2. Issue-ID: OPTFRA-155 Change-Id: I78fa78f26720ee4670fc62c250c2c4720aca2a77 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
2018-02-27Cleaning up names in SonarGildas Lanilis1-1/+1
Name is sonar should match repo name. In this case name is optf-has Change-Id: I25ec7578c0e26125d9dc7237d02012546883474c Issue-ID: CIMAN-65 Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
2018-02-19Fixed another DockerfileIkram Ikramullah1-1/+1
data component docker file was pointing to wrong repo. Fixed that to point to onap Issue-ID: OPTFRA-123 Change-Id: Ia02c97ebb8f43da21aed897cfb00e14adf7bb54d Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-02-19Correct Placement for version.propertiesIkram Ikramullah1-0/+0
Looks like jenkins parent jobs expect the verison.proeprties file to be one step higher than where it resides rihgt now. Fixed, this - hopefully next jenkins daily job will succeeed. Issue-ID: OPTFRA-124 Change-Id: I3444860123f347bbd532466f7ba7d509831b9af6 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-02-16Merge "Added unit tests for conductor.common.music module"Shankaranarayanan Puzhavakath Narayanan3-0/+250
2018-02-16Merge "Added more Unit tests for conductor/api module"Shankaranarayanan Puzhavakath Narayanan3-9/+103
2018-02-15Added version.propertiesIkram Ikramullah6-30/+132
Issue-ID: OPTFRA-124 Change-Id: I18d4ab0dd301ecf85e398c8a521e60ebbe686cf5 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-02-15Added unit tests for conductor.common.music moduleDileep Ranganathan3-0/+250
Unit tests for music api Change-Id: I9e239c23c0d3d81a860b121c7f8e462815068b31 Issue-ID: OPTFRA-68 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-02-14Dockerization EffortIkram Ikramullah8-0/+418
Added files to run components of conductor in docker. There is a build script and a run script. Run script has instructions on how to run the containers. Issue-ID: OPTFRA-123 Change-Id: Id55a25b3c54e19728ca218e7d98e20af0630a383 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-02-13Added more Unit tests for conductor/api moduleDileep Ranganathan3-9/+103
Fixed the MUSIC rpc mock for plans api Issue-ID: OPTFRA-68 Change-Id: Ic0075c1816ed84133b2248e1b91e5e39ff4866d8 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>