summaryrefslogtreecommitdiffstats
path: root/conductor
AgeCommit message (Collapse)AuthorFilesLines
2018-10-04Merge "Prometheus metrics for OOF"Shankaranarayanan Puzhavakath Narayanan7-5/+190
2018-10-03Merge "Unit test case fixed for index_create."Shankaranarayanan Puzhavakath Narayanan3-0/+42
2018-10-02Prometheus metrics for OOFDileep Ranganathan7-5/+190
Added OOF HPA metrics using prometheus client exporter Added VNF statistics, HPA statistics with respect to flavor, vim etc. Change-Id: I54030a148f97cb0c61f93bc552764c65236a467b Issue-ID: OPTFRA-312 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-10-02Unit test case fixed for index_create.Inam Soomro3-0/+42
Fixed for the table create index on plans table. Fixed comments section for index create from creates table. Issue-ID: OPTFRA-359 Change-Id: I8cd85e18c3b9dce04c2f3f571976544c16a00972 Signed-off-by: Soomro, Inam(is076r) <inam@att.com>
2018-09-28Fix AAF Authentication CSIT issuesDileep Ranganathan4-7/+8
The value stored in perms.cache is throwing JSON load error on subsequent calls. Returned the perms['roles'] from cache. Fixed expected string or buffer error in plans.py CSIT was stuck waiting for port 8100. Changed the aafsim internal port to 8100 everywhere (same as the aaf-service port). Change-Id: I00e72a0aee66bb0649996288c37c6c0aef2070d2 Issue-ID: OPTFRA-362 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-24add requirement to aafsim dockerFrank Sandoval1-0/+1
Add oslo_log to requiremnts.txt for aafism docker Issue-ID: OPTFRA-331 Change-Id: I1fbe89335189ef3dafa8fc479002919e25c7f532 Signed-off-by: Frank Sandoval <frank.sandoval@oamtechnologies.com>
2018-09-24Merge "Fix AttributeError 'MUSIC_API' for tox"Shankaranarayanan Puzhavakath Narayanan2-0/+12
2018-09-24Fix AttributeError 'MUSIC_API' for toxDileep Ranganathan2-0/+12
Fix AttributeError: 'module' object has no attribute 'MUSIC_API' while running tox manually Change-Id: I2a826b6a0628eb6430953c66256dee89001f2ab5 Issue-ID: OPTFRA-358 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-21Migrate to v14 AAI schemaDileep Ranganathan5-27/+24
Upgraded v14 AAI schema. Modified AAI simulator urls to support v14 version. Change-Id: Ib4e34d6f04b827bc6d48098f057cb76b4f523e16 Issue-ID: OPTFRA-355 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-21add AAF integration and AAF simulatorFrank Sandoval14-30/+454
Patch (#3) addresses commentse this patch fixes unit tests. Original commit added AAF permissions checks for HAS API Issue-ID: OPTFRA-331 Change-Id: I69519beee31f57e4ac5188604d21805266a06074 Signed-off-by: Frank Sandoval <frank.sandoval@oamtechnologies.com>
2018-09-21Digestion to ONAPrl001m76-619/+5075
This commit contains features added across previous iteration. Unfortunatley, its hard to separate out all the features / defect fixes under the current setup unless an automated ingestion and integration mechanims is in place. Following are the details of each feature / defect fix. - (OPTFRA-347) New Music Response Changes Required changes for upgrading to music version 3.x - (OPTFRA-346) Triage Tool Feature Changes Triage tool for finding out issues with candidates and how they were dropped - (OPTFRA-280) Order Locking Feature Changes Orders from SO need to be parked (and later retriggered) in scenarios where the orchestration of the already given solution is in progress. - (OPTFRA-281) Latency Based Homing This features enables homing based on 'network latency' defined in has's internally maintained tables instead of plain distance. Other defect fixes / performance improvements - AAI Timeout give up change Defect fix related to dropping candidates when AAI timed out and didn't retrun within 3 tries. has will now give up in these scenarios. - Defect fix replaced all() query with status based query. There was no need to reachout to Music to grab the whole plans table - we now go only by the value of the status field. Issue-ID: OPTFRA-280 Change-Id: I47fa7651c5c81763770771d6f7e7ff4ab155d18e Signed-off-by: rl001m <ruilu@research.att.com>
2018-09-19Support multiple candidates with same feature nameRuoyu Ying4-15/+578
In one flavor, there could be multiple hpa feature blocks with the same hpa-feature name. Add support to let HAS to choose a proper one between all available candidates. Change-Id: If8877a12d6e145994b0bc40aadb3b79b4718282f Issue-ID: OPTFRA-341 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2018-09-18Merge "Support new policy model in HAS"Dileep Ranganathan15-328/+799
2018-09-18Support new policy model in HASRuoyu Ying15-328/+799
Make changes to support the newly defined policy model Change-Id: Iea882b0c254c4bfca32da2458ea65f3daf56a779 Issue-ID: OPTFRA-322 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2018-09-17Merge "Secret Management Service feature"Shankaranarayanan Puzhavakath Narayanan6-0/+251
2018-09-15Secret Management Service featureDileep Ranganathan6-0/+251
Added supporting library required for enabling SMS integration. Added Unit tests and manual tests for store/retrieve/delete secrets. Updated conductor.conf with aaf_sms group. Added preload_secrets config for testing. Integration with application NOT Done in this patch. Change-Id: Idf7e4249a88a39c586d893226a9110e9d5180787 Issue-ID: OPTFRA-345 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-11Invert HPA Score for minimizing objective functionDileep Ranganathan1-1/+10
Score for each hpa constraint is entered in policy as positive value. Higher the HPA score the better. So inorder to minimize the objective function inverted HPA Score by inverting the sign of hpa_score value. Change-Id: Iaedb03ccc5f87d5e7b41509924289bb598a09139 Issue-ID: OPTFRA-313 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-11HPA Score Objective function supportDileep Ranganathan10-6/+319
Implemented HPA Score objective function for cross cloud-region best candidate selection. Added Unit tests for HPA Score multi objective function Added Unit tests to check if there is a corresponding HPA policy/constraint Change-Id: I0787080657c0b7deb3ffcb7560859e3e5c928b77 Issue-ID: OPTFRA-313 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-07Revert the authorization headerDileep Ranganathan1-4/+10
Reverting the authorization header to support older version of MUSIC. Change-Id: Ia3a653559fd1838d530e8dfd4576b1da3502ca22 Issue-ID: OPTFRA-259 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-09-05Added the Authorization header for MUSICDileep Ranganathan1-9/+7
Fixed the Authorization header required for all MUSIC API. This was affecting the HAS CSIT as the keyspace was not getting created Change-Id: I1b22b9b71729e786f6ffb9baedf11d4475485e09 Issue-ID: OPTFRA-259 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-08-30Upgrade HAS version to 1.2.11.2.1Dileep Ranganathan1-2/+2
Bump verion of docker images, pom.xml, and oparent-python to 1.2.1, 1.2.1-SNAPSHOT and 1.2.0 respectively. Change-Id: Ie57e8ac107f1fa4fb3f840869a2fe0656012d601 Issue-ID: OPTFRA-257 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-08-24Support multiple policies with same hpa-featureRuoyu Ying1-1/+2
Support to resolve multiple policies with same "hpa-feature" name Change-Id: I86d1f20ad28e30893535688460b8ef6ff1153cd3 Issue-ID: OPTFRA-323 Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>
2018-07-25Fix Docker image to use the nexus artifactsDileep Ranganathan1-7/+18
Fixed Docker image to use the nexus artifacts instead of building from source. Added proxy support. Updated the Docker image version for Casablanca. Change-Id: I42de44b5c09992822696b1e12344ac6fde51373d Issue-ID: OPTFRA-301 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-07-19Merge "Fix Dockerfile for beijing"Shankaranarayanan Puzhavakath Narayanan1-1/+2
2018-07-18Bumping the oparent and has artifact versionsDileep Ranganathan1-2/+2
Bumped the oparent-python version to 1.2.0 Bumped the has artifacts version to 1.2.0 Change-Id: Ic68133642f915f77e0d9f064e0945ee137c24188 Issue-ID: OPTFRA-301 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-07-05Fix Dockerfile for beijingDileep Ranganathan1-1/+2
Fix Dockerfile for beijing to build from beijing branch Change-Id: Ib8c04079c7acde73c9ce1dd94bcf09a9d1b2de0d Issue-ID: OPTFRA-287 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-06-01moved docs to has/docsfsandoval8-2258/+0
Issue-ID: OPTFRA-242 Change-Id: Ib46a96f5d7281084cb8c859b4bbe56265b8ccdba Signed-off-by: fsandoval <frank.sandoval@oamtechnologies.com> (cherry picked from commit 40db765dbfa3f18d59f08e84a49f08aa58b66ca0)
2018-05-31moved docs to has/docsfsandoval8-2258/+0
Issue-ID: OPTFRA-242 Change-Id: Ib46a96f5d7281084cb8c859b4bbe56265b8ccdba Signed-off-by: fsandoval <frank.sandoval@oamtechnologies.com>
2018-05-27Fix data errorDileep Ranganathan1-0/+2
Handle data error by discarding candidates with invalid data Discard candidates if the cloud-owner or region id is missing in the vserver associated with generic vnfs. This scenario can occur when invalid data is present in A&AI database. Issue-ID: OPTFRA-246 Change-Id: I1405267a8f3713c91e10da3d6fbd37c0ca3fc01f Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
2018-05-25Fix bug in VIM fit constraintDileep Ranganathan5-15/+19
When the Multicloud returns empty list instead of None value the system was throwing error. If empty list is returned from multicloud the assumption is that there is no matching VIMs with specified capacity so ultimately would result in solution not found. Change-Id: Ie7164a7cbaa41d7278b7391b56dde78318bc4509 Issue-ID: OPTFRA-245 Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
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>