summaryrefslogtreecommitdiffstats
path: root/conductor
AgeCommit message (Collapse)AuthorFilesLines
2018-05-23Fix matching issues for attribute blockv1.1.1Ritu Sood1-0/+3
For cloud inventory type empty strings in the attribute block of the demand are being matched Issue-ID: OPTFRA-244 Change-Id: I0ac3a256f32ba497d9f74ddb8ca873604ca67773 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-21Using cloud-region in vGMuxInfra flowRitu Sood2-17/+37
If no pserver available for vserver use cloud-region to get the complex information. This patch also fixes a version issue. Change-Id: I981941feef96e531b3ca427ec269cf810f652922 Issue-ID: OPTFRA-241 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-18Add a missing member to class ZoneRitu Sood1-0/+1
Solver constraint class Zone location member is missing in Zone class Change-Id: I6eaa0e051695485ff95b284cbf3cd2a535b537df Issue-ID: OPTFRA-238 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-16Ignore flavors that don't have hpa-capabilitiesRitu Sood1-2/+2
Multi-cloud creates some flavors without hpa-capabilities Issue-ID: OPTFRA-235 Change-Id: I4acfd6198bb0f494d0a34372d761c2dff7b4b301 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-11Adding basic auth to AAI PluginRitu Sood1-0/+10
For now leaving the original certificates as before so as not to disturb any existing test cases etc. Issue-ID: OPTFRA-232 Change-Id: If28c772f14c89dbf4229d754cf9dd49094fc5196 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-05-08Fix license header in setup.cfgShankar Narayanan1-0/+19
Add the license header in has setup.cfg Issue-ID: OPTFRA-231 Change-Id: I0ddb569298ae4fd401ef1fa5bddb0e765a22b3dc Signed-off-by: Shankar Narayanan <snarayanan@research.att.com>
2018-04-20Merge "Add postman scripts for HPA mannual testing"Shankaranarayanan Puzhavakath Narayanan2-0/+1906
2018-04-19Updated Postman for HPA-ConductorYing Ruoyu1-13/+148
Revise parameter value and add more test cases Change-Id: I5eff8e13f7901071299f5816829de6340e09e5fb Issue-ID: OPTFRA-169 Signed-off-by: Ying Ruoyu <ruoyu.ying@intel.com>
2018-04-16Merge "Add new replies to sim"Shankaranarayanan Puzhavakath Narayanan3-0/+392
2018-04-12Add postman scripts for HPA mannual testingYing Ruoyu2-0/+1906
Add postman scripts for HPA mannual testing on attribute "mandatory" Change-Id: I9f4fa53891b6b7ac3275f71a4ba849f0c0bd0081 Issue-ID: OPTFRA-169 Signed-off-by: Ying Ruoyu <ruoyu.ying@intel.com>
2018-04-11Add new replies to simLeonardo Bellini3-0/+392
Issue-ID: OPTFRA-218 Change-Id: I31d9fdf3c83baf7d7b350e49838142cc044507fc Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
2018-04-09Updated the AAI Simulator responsesDileep Ranganathan1-199/+143
Updated the HPA capabilities values for the AAI Simulator responses Change-Id: I2e9e4d14f03b1024d17d361f727cbe2cee2da36b Issue-ID: OPTFRA-192 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-04-06Merge "Add multicloud sim"Shankaranarayanan Puzhavakath Narayanan13-1/+292
2018-04-06Updated Postman for HPA-ConductorDileep Ranganathan1-12/+55
Change-Id: I3aeae2613025ef9a09ba51d109eaf0e3ec992d74 Issue-ID: OPTFRA-169 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-04-06Fixed HPA matching when no flavor is foundDileep Ranganathan3-10/+10
When no matching flavor is found the candidate list should be discarded and the solution should be not_found. Refactored the logic if there is already flavor_mapping. Change-Id: I24ea91436a5a5c78698801f435a6deb9e9d447e9 Issue-ID: OPTFRA-213 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-04-06Update the HAS specification guideDileep Ranganathan1-2/+386
Added HPA and VIM Fit constraints Change-Id: I0421e441331c8dedd5f6d6be72e027089425f154 Issue-ID: OPTFRA-194 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-04-05Add multicloud simLeonardo Bellini13-1/+292
Issue-ID: OPTFRA-212 Change-Id: I9bb0a1d888f4090a613038dc892be31e70bf5533 Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
2018-03-30Fixed DuplicateOptError for latest oslo.configDileep Ranganathan3-5/+1
Fixed the duplicate config in music/api.py which was occuring when the oslo.config dependency is updated to the latest 6.0.0 Also removed psycopg2 dependency which was throwing warnings. psycopg2 is not really used during tests. So removing from test dependencies Change-Id: I98e31e29ee507d982f1b9a82780f0f665de452c6 Issue-ID: OPTFRA-209 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-28Merge "HPA flavor matching code"Shankaranarayanan Puzhavakath Narayanan5-2/+752
2018-03-28HPA flavor matching codeRitu Sood5-2/+752
Code to match flavors available in candidate with required features for a VM Change-Id: Ibcb5faa8213b52607fcbb0446680da3173ff5748 Issue-ID: OPTFRA-180 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2018-03-28Fixed HPA attribute translation validationDileep Ranganathan2-28/+35
Fixed HPA Feature Atrribute parameters validation in translation Change-Id: I2dc0c65826e07d26d49f142042e848f66f0176e8 Issue-ID: OPTFRA-168 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-28Fixing the HPA parameters from Homing TemplateDileep Ranganathan6-22/+23
Fixed the label to flavorLabel Fixed the features to flavorProperties Change-Id: I157afbf5969e9434c29de21c6041e9ede7b511af Issue-ID: OPTFRA-170 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-28HPA Enablement for controller Translator ModuleYing Ruoyu2-5/+311
Add support for HPA constraints translation Add unit tests for HPA constraints validation Updated with mandatory and score parameters Updated flavorLabel and flavorProperties instead of label and features Change-Id: Iec8fff2ad71f8ebeb58ef807d8d2b95ed3635ec1 Issue-ID: OPTFRA-168 Signed-off-by: Ying Ruoyu <ruoyu.ying@intel.com>
2018-03-28Multicloud vim controller pluginDileep Ranganathan20-15/+750
Implemented Multicloud vim controller plugin Updated translator to parse vim_fit constraint Implemented vim_fit constraint type Implemented RPC for check_vim_capacity Reordered constraint rank Added unit tests Change-Id: I5f01cf8fbefbb4b53e4370c5c6b43f72897e62bd Issue-ID: OPTFRA-148 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-27Fixed oslo.config dependencyDileep Ranganathan1-2/+2
Change-Id: I725aa29918f4d30b9977413629f4bc71a3513893 Issue-ID: OPTFRA-2 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-25Implemented match all operator for HPADileep Ranganathan2-0/+113
Implemented match all operator for list inputs. For eg: InstructionSetExetensions which checks for a input set of requirements in the available capability list. Change-Id: I3784ae2f85309236f790a0d6a5927ab3ec535b97 Issue-ID: OPTFRA-181 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-25Add Postman collection for HPADileep Ranganathan3-0/+1437
Added postman scripts for Conductor, MUSIC and A&AI Added postman Multicloud mock server and check_vim_capacity API Change-Id: If8ae4d10a0bcc640d7f54e14a20b777867692ad9 Issue-ID: OPTFRA-169 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-25Add flavor label mapping to Homing responseDileep Ranganathan1-7/+11
Added flavors to the recommendation JSON response from HAS Change-Id: I7f993dba59d7a07866a2383567c75efe960e601a Issue-ID: OPTFRA-182 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-25Data Service RPC for HPADileep Ranganathan3-7/+305
Implemented RPC for get candidate list with hpa flavor mapping Added unit tests for get_candidates_with_hpa Issue-ID: OPTFRA-183 Change-Id: I9db74499ba964341368542b339163c3803e0924e Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-25HPA Constraint solver pluginDileep Ranganathan7-15/+420
Implement hpa constraint plugin and implement solve method Initialize HPA constraint per solver request Reordered constraint ranking Implemented RPC invocation to data plugin for matching hpa Change-Id: I5d63464b6bff6abc10599e000b2b56f926f146f9 Issue-ID: OPTFRA-178 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-24Merge "Fix Exception in resolve_demands RPC"Shankaranarayanan Puzhavakath Narayanan1-0/+1
2018-03-23Merge "Accommodate Changes for Music 2.4.x"Shankaranarayanan Puzhavakath Narayanan4-5/+38
2018-03-23Accommodate Changes for Music 2.4.xIkram Ikramullah4-5/+38
Issue-ID: OPTFRA-199 Change-Id: Ieadb1ae38621cd406af384458a9fce6ffdd15f0c Signed-off-by: Ikram Ikramullah <ikram@research.att.com>
2018-03-22Fix Exception in resolve_demands RPCDileep Ranganathan1-0/+1
'keyspace' is missing in the context parameter passed to the resolve_demands rpc from translator Change-Id: Ic9a3a11232ec558daa89890f904b4ee485ad3c50 Issue-ID: OPTFRA-198 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-22Merge "Added vim-id attribute for Homing Candidates"Shankaranarayanan Puzhavakath Narayanan3-8/+39
2018-03-22HPA Enablement for A&AI data pluginDileep Ranganathan5-20/+506
Implemented HPA Enablement feature support for A&AI data plugin Added flavors and hpa-capability child nodes to cloud-region cache. Added unit tests for _get_flavors Modified unit tests for resolve_demands Change-Id: Ifeedb5f53a351079e8adbd42d216633062c36e1b Issue-ID: OPTFRA-167 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-20add first seed of aaisimLeonardo Bellini9-0/+1266
Issue-ID: OPTFRA-192 Change-Id: I8347b99dbf09514dab7daa2f8e7bb8abc0122d54 Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
2018-03-16Added vim-id attribute for Homing CandidatesDileep Ranganathan3-8/+39
Added vim-id attribute to both cloud and service candidate Updated unit tests for aai.py Change-Id: I3e1faf89c0490690b3988bb6d466dfbd534e37b6 Issue-ID: OPTFRA-187 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-03-16All compnents on Single docker imageIkram Ikramullah6-120/+12
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-15Merge "Docker dir - removed unused conf file"Shankaranarayanan Puzhavakath Narayanan1-340/+0
2018-03-15Merge "Adding more unit tests and .coveragerc"Sastry Isukapalli3-4/+149
2018-03-14Docker dir - removed unused conf fileIkram Ikramullah1-340/+0
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)6-156/+10
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-12Moved all docker files moved to main folderIkram Ikramullah (ikram@research.att.com)4-63/+0
Issue-ID: OPTFRA-123 Change-Id: I9334bda9ef05ed18c4e1fe35616b53e9ba128dc1 Signed-off-by: Ikram Ikramullah (ikram@research.att.com) <ikram@research.att.com>
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>