diff options
4 files changed, 53 insertions, 44 deletions
@@ -1,40 +1,4 @@ ---- -project: 'so' -project_creation_date: '2017-01-30' -lifecycle_state: 'Incubation' -project_category: '' -project_lead: &onap_releng_ptl - name: 'Seshu Kumar' - email: 'seshu.kumar.m@huawei.com' - id: 'seshukm' - company: 'Huawei' - timezone: 'India/Bangalore' -primary_contact: *onap_releng_ptl -issue_tracking: - type: 'jira' - url: 'https://jira.onap.org/projects/SO' - key: 'SO' -mailing_list: - type: 'groups.io' - url: 'lists.onap.org' - tag: '<[sub-project_name]>' -realtime_discussion: '' -meetings: - - type: 'zoom' - agenda: 'https://wiki.onap.org/display/DW/Minutes+Of+Meeting' - url: 'https://wiki.onap.org/display/DW/Service+Orchestrator+Project' - server: 'n/a' - channel: 'n/a' - repeats: 'weekly' - time: '13:30 UTC' -repositories: - - so - - so-chef-repo - - so-docker-config - - so-libs - - so-so-config -committers: - - <<: *onap_releng_ptl + - name: 'Chuanyu Chen' email: 'chenchuanyu@huawei.com' company: 'Huawei' @@ -65,39 +29,76 @@ tsc: changes: - type: 'removal' name: 'Tal Liron' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Heliu Zhong' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Yuanwei Yang' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Christophe Closset' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Claude Noshpitz' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'maopeng zhang' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Bin Hou' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Fu Jinhua' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Jie Feng' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'jackie tian' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'removal' name: 'Deng Hui' link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' - type: 'addition' name: 'Marcus Williams' + link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' + - type: 'addition' name: 'Sanchita Pathak' link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html' - type: 'addition' name: 'Steve Smokowski' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'addition' name: 'Subhash Kumar Singh' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' + - type: 'addition' name: 'Lukasz Muszkieta' link: 'https://lists.onap.org/g/onap-tsc/message/4320' - type: 'removal' name: 'Rob Daugherty' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' - type: 'addition' name: 'Max Benjamin' - link: 'https://lists.onap.org/g/onap-tsc/message/4981?p=,,,20,0,0,0::Created,,committer,20,2,0,31638681' + link: 'https://lists.onap.org/g/onap-tsc/message/4320' - type: 'removal' name: 'DeWayne Filppi' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' name: 'Yan Yang' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' name: 'Marcus Williams' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' name: 'Sanchita Pathak' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' + - type: 'removal' name: 'Subhash Kumar Singh' + link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' - type: 'addition' name: 'Ramesh Parthasarathy' link: 'https://wiki.onap.org/display/Meetings/TSC+2020-12-03' - type: 'removal' - name: 'Max Benjamin' + name: 'Max Benjamin' + link: 'https://wiki.onap.org/display/DW/2021+TSC+Decisions' diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy index bb6fe212b3..c7302d001c 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateCommunicationService.groovy @@ -395,6 +395,10 @@ class CreateCommunicationService extends AbstractServiceTaskProcessor { e2eInputMap.put("dLThptPerSlice", dLThptPerSlice) e2eInputMap.put("uLThptPerSlice", uLThptPerSlice) e2eInputMap.put("maxNumberofConns", maxNumberofConns) + //TODO temp solution - service to slice profile mapping + e2eInputMap.put("expDataRateDL", dLThptPerSlice) + e2eInputMap.put("expDataRateUL", uLThptPerSlice) + e2eInputMap.put("maxNumberofPDUSession", maxNumberofConns) execution.setVariable("e2eInputMap", e2eInputMap) execution.setVariable("e2eServiceType", e2eServiceDecomposition.getServiceType()) diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy index e4281045bd..0d64d7811b 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy @@ -127,6 +127,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ String serviceStatus = "deactivated" String modelInvariantUuid = sliceParams.getNSTInfo().invariantUUID String modelUuid = sliceParams.getNSTInfo().UUID + String serviceFunction = sliceParams.serviceProfile.get("resourceSharingLevel") sliceParams.setSuggestNsiId(sliceInstanceId) sliceParams.setSuggestNsiName(sliceInstanceName) @@ -144,6 +145,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ nsi.setModelVersionId(modelUuid) nsi.setServiceInstanceLocationId(serviceInstanceLocationid) nsi.setServiceRole(serviceRole) + nsi.setServiceFunction(serviceFunction) String msg try { @@ -263,7 +265,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ execution.getVariable("sliceTaskParams") as SliceTaskParamsAdapter SliceTaskInfo<SliceProfileAdapter> sliceTaskInfo = sliceParams.anSliceTaskInfo sliceTaskInfo.setSliceInstanceId(serviceInstanceId) - String sliceProfileName = "an_" + sliceParams.serviceName + String sliceProfileName = "sliceprofile_an_" + sliceParams.serviceName // create slice profile ServiceInstance rspi = createSliceProfileInstance(sliceTaskInfo, sliceProfileName, oStatus) @@ -401,6 +403,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ allocateAnNssi.nsstId = sliceTaskInfo.NSSTInfo.UUID allocateAnNssi.nssiId = sliceTaskInfo.suggestNssiId allocateAnNssi.nssiName = "nssi_an" + execution.getVariable("sliceServiceInstanceName") + allocateAnNssi.scriptName = sliceTaskInfo.getScriptName() NsiInfo nsiInfo = new NsiInfo() nsiInfo.nsiId = sliceParams.suggestNsiId nsiInfo.nsiName = sliceParams.suggestNsiName @@ -458,7 +461,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ execution.getVariable("sliceTaskParams") as SliceTaskParamsAdapter SliceTaskInfo<SliceProfileAdapter> sliceTaskInfo = sliceParams.cnSliceTaskInfo sliceTaskInfo.setSliceInstanceId(serviceInstanceId) - String sliceProfileName = "cn_"+sliceParams.serviceName + String sliceProfileName = "sliceprofile_cn_"+sliceParams.serviceName // create slice profile ServiceInstance rspi = createSliceProfileInstance(sliceTaskInfo, sliceProfileName, oStatus) @@ -544,6 +547,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ allocateCnNssi.nssiName = "nssi_cn" + execution.getVariable("sliceServiceInstanceName") allocateCnNssi.sliceProfile = sliceTaskInfo.sliceProfile.trans2CnProfile() allocateCnNssi.sliceProfile.sliceProfileId = sliceTaskInfo.sliceInstanceId + allocateCnNssi.scriptName = sliceTaskInfo.getScriptName() NsiInfo nsiInfo = new NsiInfo() nsiInfo.nsiId = sliceParams.suggestNsiId @@ -602,7 +606,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ String serviceInstanceId = UUID.randomUUID().toString() sliceTaskInfo.setSliceInstanceId(serviceInstanceId) - String sliceProfileName = "tn_" + sliceParams.serviceName + String sliceProfileName = "sliceprofile_tn_" + sliceParams.serviceName //execution.setVariable("cnSliceProfileInstanceId", serviceInstanceId) //todo: // create slice profile @@ -671,6 +675,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ AllocateTnNssi allocateTnNssi = new AllocateTnNssi() allocateTnNssi.setNssiId(sliceTaskInfo.suggestNssiId) + allocateTnNssi.scriptName = sliceTaskInfo.getScriptName() //todo: AllocateTnNssi //todo: endPointId -> set into tn List<TransportSliceNetwork> transportSliceNetworks = new ArrayList<>() @@ -943,6 +948,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{ rspi.setModelVersionId(sliceTaskInfo.NSSTInfo.UUID) rspi.setWorkloadContext(sliceTaskInfo.subnetType.subnetType) rspi.setEnvironmentContext(sliceTaskInfo.sliceProfile.getSNSSAIList()) + rspi.setServiceFunction(sliceTaskInfo.sliceProfile.getResourceSharingLevel()) //timestamp format YYYY-MM-DD hh:mm:ss rspi.setCreatedAt(new Date(System.currentTimeMillis()).format("yyyy-MM-dd HH:mm:ss", TimeZone.getDefault())) diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java index 0bd6d64dc3..f06ee49dba 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java @@ -159,8 +159,6 @@ public class SliceProfileAdapter implements Serializable { List<PerfReqEmbb> perfReqEmbbs = new ArrayList<>(); PerfReqEmbb perfReqEmbb = new PerfReqEmbb(); BeanUtils.copyProperties(this, perfReqEmbb); - perfReqEmbb.setExpDataRateDL(this.expDataRateDL); - perfReqEmbb.setExpDataRateUL(this.expDataRateUL); perfReqEmbbs.add(perfReqEmbb); perfReq.setPerfReqEmbbList(perfReqEmbbs); } else if ("ullc".equalsIgnoreCase(sST)) { |