diff options
3 files changed, 112 insertions, 17 deletions
@@ -8,11 +8,17 @@ project_lead: &onap_releng_ptl id: 'yangyan' company: 'China Mobile' timezone: 'Asia/Shanghai' +project_category: '' primary_contact: *onap_releng_ptl issue_tracking: type: 'jira' url: 'https://jira.onap.org/projects/VFC' key: 'VFC' +mailing_list: + type: 'groups.io' + url: 'lists.onap.org' + tag: '<[sub-project_name]>' +realtime_discussion: '' meetings: - type: 'zoom' agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6590138' @@ -21,6 +27,21 @@ meetings: channel: 'n/a' repeats: 'weekly' time: '09:00 UTC' +repositories: + - 'vfc-gvnfm-vnflcm' + - 'vfc-gvnfm-vnfmgr' + - 'vfc-gvnfm-vnfres' + - 'vfc-nfvo-catalog' + - 'vfc-nfvo-db' + - 'vfc-nfvo-driver-ems' + - 'vfc-nfvo-driver-sfc' + - 'vfc-nfvo-driver-vnfm-gvnfm' + - 'vfc-nfvo-driver-vnfm-svnfm' + - 'vfc-nfvo-lcm' + - 'vfc-nfvo-multivimproxy' + - 'vfc-nfvo-resmanagement' + - 'vfc-nfvo-wfengine' + - 'vfc-oom' committers: - <<: *onap_releng_ptl - name: 'Anatoly Andrianov' @@ -123,6 +144,7 @@ committers: company: 'Intel' id: 'Ruoyu' timezone: 'Asia/ShangHai' + tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java index 29524ccd..1311fb2b 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java @@ -1,6 +1,7 @@ /** * Copyright 2016-2017, Nokia Corporation. - * + * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -76,22 +77,92 @@ public class InstantiateVnfContinueRunnable implements Runnable { private Gson gson = new Gson(); - public InstantiateVnfContinueRunnable(String vnfmId, InstantiateVnfRequest driverRequest, String vnfInstanceId, String jobId, - NslcmMgmrInf nslcmMgmr, CatalogMgmrInf catalogMgmr, CbamMgmrInf cbamMgmr, Driver2CbamRequestConverter requestConverter, VnfmJobExecutionMapper dbManager, VnfcResourceInfoMapper vnfcDbMgmr) - { - this.driverRequest = driverRequest; - this.vnfInstanceId = vnfInstanceId; - this.jobId = jobId; - this.nslcmMgmr = nslcmMgmr; - this.catalogMgmr = catalogMgmr; - this.cbamMgmr = cbamMgmr; - this.requestConverter = requestConverter; - this.jobDbMgmr = dbManager; - this.vnfmId = vnfmId; - this.vnfcDbMgmr = vnfcDbMgmr; + // Builder class + + public static class InstantiateVnfContinueRunnableBuilder { + private String vnfmId; + private InstantiateVnfRequest driverRequest; + private String vnfInstanceId; + private String jobId; + private NslcmMgmrInf nslcmMgmr; + private CatalogMgmrInf catalogMgmr; + private CbamMgmrInf cbamMgmr; + private Driver2CbamRequestConverter requestConverter; + private VnfmJobExecutionMapper dbManager; + private VnfcResourceInfoMapper vnfcDbMgmr; + + public InstantiateVnfContinueRunnableBuilder setVnfmId(String vnfmId) { + this.vnfmId = vnfmId; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setDriverRequest(InstantiateVnfRequest driverRequest) { + this.driverRequest = driverRequest; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setVnfInstanceId(String vnfInstanceId) { + this.vnfInstanceId = vnfInstanceId; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setJobId(String jobId) { + this.jobId = jobId; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setNslcmMgmr(NslcmMgmrInf nslcmMgmr) { + this.nslcmMgmr = nslcmMgmr; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setCatalogMgmr(CatalogMgmrInf catalogMgmr) { + this.catalogMgmr = catalogMgmr; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setCbamMgmr(CbamMgmrInf cbamMgmr) { + this.cbamMgmr = cbamMgmr; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setRequestConverter(Driver2CbamRequestConverter requestConverter) { + this.requestConverter = requestConverter; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setDbManager(VnfmJobExecutionMapper dbManager) { + this.dbManager = dbManager; + return this; + } + + public InstantiateVnfContinueRunnableBuilder setVnfcDbMgmr(VnfcResourceInfoMapper vnfcDbMgmr) { + this.vnfcDbMgmr = vnfcDbMgmr; + return this; + } + + public InstantiateVnfContinueRunnable build() { + return new InstantiateVnfContinueRunnable(this); + } } - public void run() { + + private InstantiateVnfContinueRunnable(InstantiateVnfContinueRunnableBuilder builder) { + + this.driverRequest = builder.driverRequest; + this.vnfInstanceId = builder.vnfInstanceId; + this.jobId = builder.jobId; + this.nslcmMgmr = builder.nslcmMgmr; + this.catalogMgmr = builder.catalogMgmr; + this.cbamMgmr = builder.cbamMgmr; + this.requestConverter = builder.requestConverter; + this.jobDbMgmr = builder.dbManager; + this.vnfmId = builder.vnfmId; + this.vnfcDbMgmr = builder.vnfcDbMgmr; + + } + + public void run() { //step 1 handle vnf package handleVnfPackage(); diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java index 79df78da..07499209 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/impl/VnfContinueProcessorImpl.java @@ -39,8 +39,10 @@ public class VnfContinueProcessorImpl implements VnfContinueProcessorInf{ String jobId, NslcmMgmrInf nslcmMgmr, CatalogMgmrInf catalogMgmr, CbamMgmrInf cbamMgmr, Driver2CbamRequestConverter requestConverter, VnfmJobExecutionMapper jobDbManager, VnfcResourceInfoMapper vnfcDbMgmr) { - InstantiateVnfContinueRunnable task = new InstantiateVnfContinueRunnable(vnfmId, driverRequest, vnfInstanceId, - jobId, nslcmMgmr, catalogMgmr, cbamMgmr, requestConverter, jobDbManager, vnfcDbMgmr); + InstantiateVnfContinueRunnable task = new InstantiateVnfContinueRunnable.InstantiateVnfContinueRunnableBuilder() + .setVnfmId(vnfmId).setDriverRequest(driverRequest).setVnfInstanceId(vnfInstanceId).setJobId(jobId) + .setNslcmMgmr(nslcmMgmr).setCatalogMgmr(catalogMgmr).setCbamMgmr(cbamMgmr) + .setRequestConverter(requestConverter).setDbManager(jobDbManager).setVnfcDbMgmr(vnfcDbMgmr).build(); Executors.newSingleThreadExecutor().submit(task); } |