summaryrefslogtreecommitdiffstats
path: root/conductor
AgeCommit message (Collapse)AuthorFilesLines
2020-04-29Merge "Add generator plugin for candidate generation"Vikas Varma4-1/+462
2020-04-29Merge "Fix aai relationship link query"Vikas Varma1-3/+4
2020-04-30Fix aai relationship link querykrishnaa961-3/+4
Issue-ID: OPTFRA-746 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: Ia0b67b7517100180ce2b47d95d1d2b56d9d5931f
2020-04-29enable https mode when using serverurl in musicdhebeha2-4/+4
Issue-ID: OPTFRA-747 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com> Change-Id: I8ca13756bea53d63aae1bea50705fc531a82088e
2020-04-29Merge "Add nsi info to the candidates"Shankaranarayanan Puzhavakath Narayanan3-17/+37
2020-04-28Modify threshold policy to support multiple constraintskrishnaa964-38/+34
Issue-ID: OPTFRA-730 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I8f8b4a694048088fcb61b6dbe7428b73f52e65d2
2020-04-28Add nsi info to the candidateskrishnaa963-17/+37
Issue-ID: OPTFRA-746 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: Icdb669e92cd55bfd40aeac61d0aa2ecf1a65de84
2020-04-23Add generator plugin for candidate generation2.0.3krishnaa964-1/+462
Issue-ID: OPTFRA-744 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I047572609573ca8ab2fa91e087e9f37232eb0371
2020-04-17Change file permissions for nginx files2.0.2krishnaa961-2/+3
Issue-ID: OPTFRA-734 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I939faa52c1825479e6ad42a755fc357c067de064
2020-04-15Remove encryption of passwords for hasvrvarma2-3/+3
Change-Id: I06134255f2789cdd03dcdfddbe259c85ac81062c Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-732
2020-04-15Fix AAF authentication in conductor apikrishnaa966-13/+13
Fix AAF authentication and move all password decryption to common place Issue-ID: OPTFRA-733 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I14c119bb246c26b7dc5b5144a843ff627587141b
2020-04-09Nonroot user exposing as default user for the imageIkramullah, Ikram1-19/+24
Defaulting the image user to be 'onap' instead of root Issue-ID: OPTFRA-711 Signed-off-by: Ikramullah, Ikram <ikram@research.att.com> Change-Id: I0241633605a6b7088a2819ddf22c3ef1e65360f2
2020-04-09Fix python3 migration issue in solverkrishnaa961-1/+1
Issue-ID: OPTFRA-728 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I3b2640acef68fe060e160c939c5b07ef617f89cf
2020-03-23Fix has docker build to conform to self-releasevrvarma3-3/+66
Change-Id: I27671db832cb85517bd7f7a0c587a9a02c2eec61 Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-722
2020-03-20Increment release version for has to 2.0.1vrvarma1-2/+2
Change-Id: I554d2b91467b5b5f84901be64e6d0eeb4fb8cf2e Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-727
2020-03-17Merge "Build changes to generate docker staging images for optf-has"Shankaranarayanan Puzhavakath Narayanan1-0/+66
2020-03-17Migrate unit tests to python3krishnaa9618-103/+61
Issue-ID: OPTFRA-645 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I094eaa594e7a6f6541ca5d894e0af5127afd3936
2020-03-17Build changes to generate docker staging images for optf-hasvrvarma1-0/+66
Change-Id: I4e9fa87c7b7aed47d73c9a2f39f2f893a57a731a Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-718
2020-03-16Merge "Increment HAS release version"Shankaranarayanan Puzhavakath Narayanan1-2/+2
2020-03-13Add functionalities to support NSSI selectionkrishnaa9615-9/+488
Add threshold constraint Modify AAI plugin to get NSSIs from AAI Issue-ID: OPTFRA-677 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: Ic9bc97aca3835eba99d0a3f1580c281c3856b1cf
2020-03-11Increment HAS release versionvrvarma1-2/+2
Change-Id: Iba05adab9d20ba0cb44d73f9a8c96278df957b6e Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-716
2020-02-28Change password in music_api to decrypted passwordkrishnaa961-1/+1
Issue-ID: OPTFRA-683 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: If0ee6a09571062706b77bd747522a28b64041d80
2020-02-27Change requirement versions for python 3.8krishnaa962-4/+3
Add byte to string conversion after base64 encode Issue-ID: OPTFRA-645 Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com> Change-Id: I27326dd35b6727da80c159cb34d5d67e0829cf8f
2020-02-26Merge "Python3.8 related changes."Shankaranarayanan Puzhavakath Narayanan23-80/+96
2020-02-26Dockerfile updated to use python 3.8Ikramullah, Ikram1-1/+1
Issue-ID: OPTFRA-645 Signed-off-by: Ikramullah, Ikram <ikram@research.att.com> Change-Id: Ic9ff68036e53feb7938006d4caaf489a23530c7c
2020-02-26Python3.8 related changes.Dingari, Sridevi23-80/+96
Issue-ID: OPTFRA-645 Signed-off-by: Dingari, Sridevi <sridevi.dingari@att.com> Change-Id: I27dfc3bb9c68657658de95ca1ab491db614d35ab
2020-01-24Encryption/Decryption utilityIkram Ikramullah12-18/+153
Putting in the encryption/decryption utility. Hit cipher-util inside the virutalenv to see its usage. The work is still in progress. Issue-ID: OPTFRA-683 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com> Change-Id: I7a4845c1318db8d14f1efbb0f98e785adf214e06
2020-01-10Add AAF root cert location to conductor.confdhebeha2-0/+10
Modify multicloud.py to verify the session using AAF root certificate if https Issue-ID: OPTFRA-328 Change-Id: Ica47cbda3821120a020f34c97a4e398e2f7bbda5 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com>
2019-11-19Add passthrough attributesLukasz Rajewski9-27/+72
Added passthrough attributes in placement request. Current attributes HAS request section changed to filtering_attributes and new passthrough attributes added in HAS request - this one is read from vnf policy passthroughAttributes section. Issue-ID: OPTFRA-610 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Ie2719fdd94bb0b42ef7cf2cbf47f5f182a4e7347
2019-09-16Increment HAS to version 1.3.31.3.3Ruoyu Ying1-2/+2
Bump up the version for release use Issue-ID: OPTFRA-546 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com> Change-Id: I2949c46c41fa55ef9ae88bb6e112ef47d6e6cbd1
2019-08-31Enable AAF RootCA in rest call to MUSICRuoyu Ying6-0/+18
Add AAF RootCA cert in the rest call Switch to Https interface Issue-ID: OPTFRA-562 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com> Change-Id: Ie1860fe8f8ceb11d911d3f1fd83c1b6feea9b8f5 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2019-07-31Bump version to 1.3.2-stagingRuoyu Ying1-2/+2
Issue-ID: OPTFRA-546 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com> Change-Id: I42ccd920262b11467064f6479b267ee54e94db7a
2019-07-29List of canidate identifiers supportLukasz Rajewski5-9/+21
List of candidate identifers in required and excluded candidates list now is supported only as a list Issue-ID: OPTFRA-486 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: I1628a5806ff1faecabc9c94507621e786a622f2c
2019-05-31Remove duplicate 'flavorId' in directivesRuoyu Ying1-1/+2
Issue-ID: OPTFRA-499 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com> Change-Id: Ic680060a8bdff7ea0fb5ae91da80e872ccbd0b49
2019-05-17Bump version of staging to 1.3.11.3.1Shankar Narayanan1-2/+2
Change-Id: Ic104f4b53c0ae38a020a92c21f7f430137027226 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com> Issue-ID: OPTFRA-501
2019-05-03Add num_solution to the api decorators1.3.0Shankar Narayanan2-0/+2
Change-Id: Ie63c36274d99e01975b12a12ba648392a51a8d29 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com> Issue-ID: OPTFRA-496 Add num_solution to the api decorator Change-Id: Ie63c36274d99e01975b12a12ba648392a51a8d29 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com> Issue-ID: OPTFRA-496
2019-04-30Bump up version of HAS 1.3.0Shankar Narayanan1-2/+2
Change-Id: Ibf95e938917d153e4d83f42ab6c6972fb3719bae Signed-off-by: Shankar Narayanan <snarayanan@research.att.com> Issue-ID: OPTFRA-491
2019-04-30Bump up version of HAS 1.3.0Shankar Narayanan2-3/+3
Change-Id: I056f211082df6dbbdfdc89f915d0e720bb86e1e1 Signed-off-by: Shankar Narayanan <snarayanan@research.att.com> Issue-ID: OPTFRA-491
2019-04-25Added the missing arguments required for image buildingIkram Ikramullah1-9/+16
Change-Id: Ibe8dab7327485d06d5632e27879291282530c22f Issue-ID: OPTFRA-461 Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2019-04-25Merge "Changes related to running oof on TLS/HTTPS"Shankaranarayanan Puzhavakath Narayanan2-36/+46
2019-04-24Changes related to running oof on TLS/HTTPSIkramullah, Ikram2-36/+46
Change-Id: Ie20e65a70262f7b42e0eb9a033768e429d85f7d6 Issue-ID: OPTFRA-461 Signed-off-by: Ikramullah, Ikram <ikram@research.att.com>
2019-04-18Merge "New Inventory type for TD"Shankaranarayanan Puzhavakath Narayanan21-379/+1918
2019-04-18New Inventory type for TDLukasz Rajewski21-379/+1918
* New inventory type 'vfmodule' for ditribute traffic and refactored 'service' type that has many functions in common with 'vfmodule' type * Improved optimizer for random pick algorithm when no optimization constraint is specified * Unit tests added * resolve_demands() refactored to make it testable and to remove code repetitions for different inventory types Change-Id: If5c7e7d2d4e7c1b449d0b37e5c33c697aa4e653f Issue-ID: OPTFRA-445 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2019-04-10code coverage solver-request packageSudarshan Kumar4-0/+80
code coverage solver-request package Issue-ID: OPTFRA-302 Change-Id: Ia96df359f0fca4325afa59eabc63eb61c3ca7a5d Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-04-10Code coverage for Utils and Music packageSudarshan Kumar6-0/+108
Code coverage for Utils and Music package Issue-ID: OPTFRA-302 Change-Id: If487fae7e52a26e5b884a6d5db25d47b8cd580f9 Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-04-10Pyunit Coverage for solver-resourceSudarshan Kumar4-0/+159
Pyunit Coverage for solver-resource Issue-ID: OPTFRA-302 Change-Id: Ic18a37e59bcef67cca9de733d4a62a3016220a0d Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-04-09Merge "Pyunit decision_path.py"Shankaranarayanan Puzhavakath Narayanan1-0/+41
2019-04-09Added _init_.py and updated test_random_pick.pySudarshan Kumar5-3/+105
Added _init_.py and updated test_random_pick.py Issue-ID: OPTFRA-302 Change-Id: Ibe9d39626fef09cc51d5d49492fb622a9e18979e Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-04-08Pyunit decision_path.pySudarshan Kumar1-0/+41
Pyunit decision_path.py Issue-ID: OPTFRA-302 Change-Id: Ib495c52324dbe28a294321406130eda7e53659e2 Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
2019-04-08Pyunit for random_pick.pySudarshan Kumar1-0/+42
Pyunit for random_pick.py Issue-ID: OPTFRA-302 Change-Id: I69b7443af188317978bc06194412f4689267c56a Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>