Age | Commit message (Collapse) | Author | Files | Lines |
|
Project: optf/has master fbafa4fc9aa5a130870ce0cacaba90a9384303b4
Add flavor label mapping to Homing response
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>
|
|
Project: optf/has master 3437fc2b299bf73a525bbb30e9241af14c62bd57
Data Service RPC for HPA
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>
|
|
Project: optf/has master ac91747b8819d23fd2e56d9e1dd170b83498a2bf
HPA Constraint solver plugin
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>
|
|
Project: integration master 85f1b4ebe0d74f6d4b4c82bf1b1396c1da7b88d1
Merge "Update to released version of AAI common"
Update to released version of AAI common
Issue-ID: AAI-946
Change-Id: I05a8fe7a86900d8ad8231cabeeffc4d10e77f3d2
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
|
|
Project: integration master 2fd354e7fd2528521b1d37b8cc029c6cb193e290
Merge "complete test cases for M4"
complete test cases for M4
Issue-ID: OPTFRA-204
Change-Id: I0010ecae5f64fbe0b3c0be5cb9ebc52d9a426254
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>
|
|
Project: so/libs master 34b23e12ae050e792341faaf9e7fe28da6ea43f2
Update so/libs to version 1.2.1
This version's parent will be oparent:1.1.0 instead of oparent:1.1.0-SNAPSHOT
(which has been banned).
Change-Id: I562f02b096687e18689615a4b234b911bbeca1fb
Issue-ID: SO-536
Signed-off-by: Rob Daugherty <rd472p@att.com>
|
|
Project: oom master bd46220299a64b32296a998ca74c37a1510007d4
Merge "adding K8s job completion utility"
adding K8s job completion utility
Integrating the Work that was originally done by SDC team:
https://gerrit.onap.org/r/gitweb?p=sdc.git;a=tree;\
f=sdc-os-chef/kubernetes/sdc/templates/configmaps;hb=HEAD
into the readiness image
Issue-ID: OOM-832
Change-Id: Icb22a8d0a67495860008dc6d6960e043d982c668
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: Areli Fuss <af732p@intl.att.com>
|
|
|
|
Synchronize with externalapi/nbi master branch
Clean up .gitmodules
Change-Id: If9198bd88cab502f89b0901a84289fe2449fc5ea
Issue-ID: DOC-255
Signed-off-by: Rich Bennett <rb2745@att.com>
|
|
Project: integration master d3e6f379bee2a3f38ba70756e94476becfece344
Update java manifest
Update java manifest for Beijing Release of CLAMP
Change-Id: I0f93a7732e4e50adba06ebe421fae0733af445b0
Issue-ID: CLAMP-128
Signed-off-by: ChrisC <cc697w@intl.att.com>
|
|
Project: portal master 11b79e5093d8e7fa45b0ce4eceda0b56c27f13fa
Merge "Sonar Issues for ExternalAppInitializer.java"
Sonar Issues for ExternalAppInitializer.java
Minor and Major Sonar issues for ExternalAppInitializer.java
Change-Id: I2673a13f73e88acc970c6aa64431f8124cf068cf
Issue-ID: PORTAL-227
Signed-off-by: Hari Om Verma <hv00482922@techmahindra.com>
|
|
Project: portal master 229ae9fdd468bec4da29218688c090873cfab907
Merge "Sonar Issues for ExternalAppConfig.java"
Sonar Issues for ExternalAppConfig.java
Minor and Major Sonar issues for ExternalAppConfig.java
Change-Id: Ib62f9436a63639fa6481bd9823712e252a6dd83b
Issue-ID: PORTAL-226
Signed-off-by: Hari Om Verma <hv00482922@techmahindra.com>
|
|
Project: portal master 0d18bed7939ac8258c9fd7b68b41fbf45901c6b2
Merge "Sonar Issues for PostSearchBean.java"
Sonar Issues for PostSearchBean.java
Minor and Major Sonar issues for PostSearchBean.java
Change-Id: I7337218b018e69ed60714d7484c4170fae38f9e0
Issue-ID: PORTAL-225
Signed-off-by: Hari Om Verma <hv00482922@techmahindra.com>
|
|
Project: portal master cca0e629c973b13318ba6a17d62f82bbd3f19ce1
Merge "Sonar Issues for ExtractJar.java"
Sonar Issues for ExtractJar.java
Minor and Major Sonar issues for ExtractJar.java
Change-Id: I8639d2fd76832c0f9f155721e8fb9423cb3b16b6
Issue-ID: PORTAL-213
Signed-off-by: Hari Om Verma <hv00482922@techmahindra.com>
|
|
Project: portal master c4fa171c0cc8f1e227f6042387fdd2c5b56bd2dd
Merge "Sonar Issues for ExtractJar.java"
Sonar Issues for ExtractJar.java
Minor and Major Sonar issues for ExtractJar.java
Change-Id: Ida807e6d2fbeae7c7b2b66ca227c0aa5fcf020b2
Issue-ID: PORTAL-213
Signed-off-by: Hari Om Verma <hv00482922@techmahindra.com>
|
|
Project: clamp master c3472b1ec153c564fb99b37eb17c764db0d530fc
Merge "Update Documentation"
Update Documentation
Update Architecture and main Beijing Release Documentation.
Change-Id: I896739dbbeaab500d738e3176290f1a31275811d
Issue-ID: CLAMP-128
Signed-off-by: ChrisC <cc697w@intl.att.com>
|
|
Project: sdc/sdc-workflow-designer master 53a0027afd07d532a0c5d8d51ecffbfd5995b773
Fix Nexus IQ Issue.
Change org.apache.velocity's velocity to velocity's velocity
Issue-ID: SDC-1127
Change-Id: I1667291e615b5121bff429a0c8cd11a33295ec98
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 59884c775c9d06e2195401a09e08650a5cf37b20
Display Extend Activities on WF Designer UI.
Display Extend Activities on WF Designer UI.
Use Extend Activities to Design Workflow and Save
Issue-ID: SDC-1130,SDC-1131
Change-Id: Iea62eb0edafb2270deaac89b458015e78d961cd0
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 8261a4ea8091c27b61ac581a852e2e18283b3cdd
Include paletx components
Include paletx components to WF Designer UI.
Issue-ID: SDC-1130,SDC-1131
Change-Id: Iad06b2dde8fc98d03a0e3633e829b686d75cafd0
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Include paletx core
Include paletx core to WF Designer UI.
Issue-ID: SDC-1130,SDC-1131
Change-Id: I9a2591e022b5ff118cccbbc839796be19d70df84
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Add model/node-data-type
Add model/node-data-type
Issue-ID: SDC-1130,SDC-1131
Change-Id: I90b1bf3c63aa02bf8cbbf1a57e0278301f6ecf19
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Add model/workflow/swagger
Add model/workflow/swagger
Issue-ID: SDC-1130,SDC-1131
Change-Id: Id2de13c045ac81e147a1586c1d566b4a55033553
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Add shared/input.
Add shared/input.
Issue-ID: SDC-1130,SDC-1131
Change-Id: Ib904ee1cf1801c094a04284d01062f9aecc9735e
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Modify css files
Modify css files
Issue-ID: SDC-1130,SDC-1131
Change-Id: I5da79bb12b7f9e52a4317bae190f873d2949b84f
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
Add paletx common & util
Add paletx common & util
Issue-ID: SDC-1130,SDC-1131
Change-Id: Ibbdd8d4fabf45637be7d44400c18d34efc15d46e
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 5b3cc39ad139793fe689683a4a7344ddb3c8361f
Update directive and shared
Update directive and shared
Issue-ID: SDC-1130,SDC-1131
Change-Id: I900b87ee4c16ddc5f827d4d43d55cab509130e6e
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: oom master b59128a3e07f472cd2cc0f25e9e4440981db6a09
Merge "Add standardized helm chart for log"
Add standardized helm chart for log
Change-Id: Ic9f0eb567716224893955d9379e9ed9308b9ea79
Issue-ID: OOM-740
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
|
|
Project: cli master 4debf9645be8400ac9b6a087b1d9d829f5ee924a
Merge changes Iffcf11d8,If61f2f73,I382d6ece,Ib24080e7,Iafbe217a, ...
* changes:
CLI: policy-operational-create
CLI: policy-list
CLI: policy-config-create
CLI: policy-push
Correct policy auth CLI yaml
Macro fails to subsitute map param
CLI: policy-operational-create
Issue-ID: CLI-78
Change-Id: Iffcf11d8bf0bf333c7a8335ad7ea777534b4353a
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
CLI: policy-list
Issue-ID: CLI-78
Change-Id: If61f2f738e308b24d67424b922c653c53c965e53
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
CLI: policy-config-create
Issue-ID: CLI-78
Change-Id: I382d6ece9068cd71f55c7219e26192886119f3bc
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
CLI: policy-push
Issue-ID: CLI-78
Change-Id: Ib24080e7c6a9628f6464b8ba37dec2f8d7f6e858
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Correct policy auth CLI yaml
Issue-ID: CLI-78
Change-Id: Iafbe217a56271d0e27c49d28fa094e38b886ec49
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Macro fails to subsitute map param
Issue-ID: CLI-78
Change-Id: Ice150ba53f85b9bbed5264805b06f6c28e2d21e7
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
|
|
Project: sdc/sdc-workflow-designer master aa95b3b4821d7349c9c12228481609d054e1c476
Modify css
Modify css
Issue-ID: SDC-1130,SDC-1131
Change-Id: Ifac3cba09e400add51065528b5443271f8971bc5
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 3036f633a343e6c74563e209420002d4784f888f
Add Util Methods
Add Util Methods
Issue-ID: SDC-1130,SDC-1131
Change-Id: I37f8e484c1d4268a26e918597d7799fafe13db88
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 3f0f14e9d95265ddf4231e06320c81ae83a7093d
Modify index.html and css
Modify index.html and css
Issue-ID: SDC-1130,SDC-1131
Change-Id: Ic0451100918216c1ea408779bb32a692fbc848b8
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 2be49b1d45d52342839c9671766fd991407bbbca
Add paletx assets.
Add paletx assets.
Issue-ID: SDC-1130,SDC-1131
Change-Id: I4b184c22d3542f8cb141b0984ab8a7a6c7a8f141
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: clamp master 440d34023d8ad1864ebaecf6a7f70dd717710feb
Incorrect environment
Change-Id: If5e81b735646c507dea46dcea86ceb08e0ef2442
Issue-ID: CLAMP-124
Signed-off-by: ac2550 <ac2550@intl.att.com>
|
|
Project: sdc/sdc-workflow-designer master 861679f2128c3b746d7e3cee15e05bbc15f3d02b
Modify i18n files.
Modify i18n files.
Issue-ID: SDC-1130,SDC-1131
Change-Id: I7a68dc06d269a9f0a6eaaa30d824967e8adc48d8
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 6448ceed6c03ae87fdae88df9abcbf8eeb532bd1
Add svgs.
Add svgs.
Issue-ID: SDC-1130,SDC-1131
Change-Id: I231a1a8902e0d91364dee8beb139f9febc8a230c
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 5fc43ca54bcde3a5b6b158827da13dc2431812f0
Add paletx assets files.
Add paletx assets files.
Issue-ID: SDC-1130,SDC-1131
Change-Id: Ic31c668fd89728d2ff7a00dc2877a86785870724
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 5b981bbbba6c0e4dc85b32544b35041baaa7cfda
Update .gitignore
Add new ignore files.
Issue-ID: SDC-1079
Change-Id: I3f898214457ebaedfed948a3015385b4e2a40854
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master afc775574a186e17858f0f99f9d1e152738d498c
Update Sample Data for Workflow.
Remove Chinese Characters from Sample Data of Workflow.
Issue-ID: SDC-1128
Change-Id: I057d99d8be850a6f37c525e7dad519aabedca405
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 7e6405c9f6b060a517ac11be307853024d3d4426
Get Icon Data of Extend Activity.
Get Icon Data of Extend Activity.
Issue-ID: SDC-1129
Change-Id: I55e46068258e114cea1241285f1cab3e387a09f2
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc/sdc-workflow-designer master 67e5767330046dd3a4b6996cb2cf8e19d1955ae5
Update parent pom version.
Change parent pom version from 1.1.0-SNAPSHOT to 1.1.0
Issue-ID: SDC-1004
Change-Id: I47e472fc926daf8b20c461139ab146f87f0620af
Signed-off-by: YuanHu <yuan.hu1@zte.com.cn>
|
|
Project: sdc master fb81a037f9f81be9bdb4b13032a9415654d6d2cc
Activity Spec Service - Add to sdc main pom
Add services/activity-spec module to sdc build in profile "all"
Change-Id: Ifb65033eee9ae5e970cd2c49fc06905f087650f1
Issue-ID: SDC-1048
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
|
|
Project: sdc master 4345677a2732d0a713300180d83f529a1adc63ff
VLAN tagging - Pattern 4 VFC Instance Group
1. Create VFC instance group per sub-interface
network role for pattern 4 heats
2. Added tests and updated existing test data
Change-Id: Id4f84c5a7dac3adfddde1192947ecaa5502f21df
Issue-ID: SDC-1073
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
|
|
Project: vfc/nfvo/lcm master cbb9954bb32cdd161ea39d8fd81bd5c93981d504
Improve VF-C documnent
Issue-ID: VFC-828
Change-Id: Ibddfb5bf709567e8060c8c3363c1cb8d76920d98
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
|
|
Project: oom master 7faae98a3527e146e9fe0c0979729e4e3687c206
Removing DCAE
Issue-ID: OOM-772
Change-Id: Idb0dad8cf16d662d7278d27fecd3ed38226d24a4
Signed-off-by: Priyanka <Priyanka.Jain3@amdocs.com>
|
|
Project: cli master 1728b94a35c33719e87c664ecc726db4b07dc20c
Merge changes I72578476,I9eef1884,Ie79342fc,I828f860a,I8c5cce76, ...
* changes:
Add policy feature in onap beijing products
Add policy basic auth onap beijing
Add state info in help message
Discover command state and persist
Intrdouce command state
Strip off poduct name from service name in help
Add policy feature in onap beijing products
Issue-ID: CLI-78
Change-Id: I72578476f2af641dd7324c9e60b929c5b564d770
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Add policy basic auth onap beijing
Issue-ID: CLI-78
Change-Id: I9eef18844fb66f3410353f27bac89fe5885f1cc2
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Add state info in help message
Issue-ID: CLI-78
Change-Id: Ie79342fc3fc5322ca9b1a6517b03c8d7bf03dd81
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Discover command state and persist
Issue-ID: CLI-100
Change-Id: I828f860ab5994796ceb692dbf12a7323ebd4d07a
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Intrdouce command state
Issue-ID: CLI-100
Change-Id: I8c5cce763a05722778a816f0dafbdd0bc23035b2
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Strip off poduct name from service name in help
Issue-ID: CLI-100
Change-Id: I4c9b802f478f65c63e89040ecac3b5b931810f1d
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
|
|
Project: sdc master 4a065a54483b0d64e2bb2b54c82f167e28d4dcf8
Activity Spec Service - Refactor unit test
Resolve review comments
Refactor unit test. Remove mock classes.
Change-Id: I9185121e84c2d9337db3b35b9156d328bf0e0d8c
Issue-ID: SDC-1048
Signed-off-by: sheetalm <sheetal.mudholkar@amdocs.com>
|
|
Project: vid master b1c8e14d685ba237ad5613caba6f0f7c307fc5ef
Fix security issues
Change-Id: I007fb66bf9c4095888dccb20e92fddc566fd90a2
Issue-ID: VID-149
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
|
|
Project: clamp master e43106fe1e1112747bf94190ff05c3d1a2e8226d
Merge "Security Fix"
Security Fix
Introduce a centralized ObjectMapper for Resteasy and Clamp code
so that the automatic Ser/deserialization of all classes is disabled.
Issue-ID: CLAMP-135
Change-Id: I1fb11c8fc8e7a53ef832774fa8c06af1c70d3dad
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
|
|
Project: sdc master 56e56b8860cf6e7ad70dc65134e8fd87eaf01123
VLAN tagging - VFC Instance Group
1. Create VFC instance group per sub-interface
network role
2. Refactored PortTemplateConsolidationData and
its references based on review comments
3. Updated test data after rebase
4. Updated to flatMap based on review
comments
Change-Id: I423593c5156ecae5eff3a4f2ce8591c85db727cc
Issue-ID: SDC-1073
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
|
|
Project: vfc/nfvo/lcm master d4d1be38adec3ad158ad12bd956e36737695def4
Merge "Add vfc-nslcm logDir check"
Add vfc-nslcm logDir check
Change-Id: I731ac0a01d5a5b840c3acedf9a3894549bacbfcb
Issue-ID: VFC-839
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
|
|
Project: vfc/nfvo/lcm master d678b87cec20d0186def04e2a29ad17f9b81a90d
Merge "Add vfc-nslcm log integration config"
Add vfc-nslcm log integration config
Change-Id: I3b78eed809916415833aaef03d68c6ba597f64e1
Issue-ID: VFC-839
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
|
|
Project: cli master 63209d5f04eef41c54b3ab04e1950e17a4e8e2bb
delete service relation
Issue-ID: CLI-93
Change-Id: Ibba411e6cb7685439eb84c85bc0783537cee5735
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
create service relation
Issue-ID: CLI-93
Change-Id: I8a64c59f4170654a44eb25a47d2cfcf57ab68a2a
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
update vnf create
Issue-ID: CLI-93
Change-Id: I05bb4ad2365813861a4ef63ee332b0bbae72400c
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
create subscription
Issue-ID: CLI-93
Change-Id: Ib871a91edae849654e1ca6e7bb22213cb091ed47
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
list service relation
Issue-ID: CLI-93
Change-Id: I60b8bec6329d4340ec9f58f715c02e439decdb42
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
create service
Issue-ID: CLI-93
Change-Id: I6494b9e311abda8ad59700a651c6cdecf9949996
Signed-off-by: xingxiaocheng <xingxiaocheng@huawei.com>
|
|
Project: dmaap/messagerouter/messageservice master e11c17099ac25becf57241ec78e241e720e24f7c
Changes to fix the docker image creration
Issue-ID: DMAAP-338
Change-Id: I43c6deb1c6ca4801c4033d49488da96c6ac36b44
Signed-off-by: su622b <sunil.unnava@att.com>
|
|
Project: vfc/nfvo/driver/vnfm/svnfm master 468dc5c8fce485004afc84ba425f949c0d8e7f0f
Merge "Add vfc-ztevnfmdriver logDig check"
Add vfc-ztevnfmdriver logDig check
Change-Id: I14edf0aa42f70345870556f69de697eb2b345d51
Issue-ID: VFC-839
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
|
|
Project: vfc/nfvo/driver/vnfm/svnfm master fa7c6dc4478fd8d2b1a84141f522f7e06ff4747e
Merge "Add vfc-ztevnfmdriver log integration config"
Add vfc-ztevnfmdriver log integration config
Change-Id: I64a175eb2f516f060bb909acdcfb47d54efc8c14
Issue-ID: VFC-839
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
|
|
Project: multicloud/framework master 1ac1a7dea970ec0c0e8f990b1d1efea38919188d
Merge " Fix script syntax error"
Fix script syntax error
Change-Id: I28325788c1080bbc5c8a9027214c41d4f40bf1ea
Issue-ID: MULTICLOUD-202
Signed-off-by: liangke <lokyse@163.com>
|