}
private fun generateServiceName(jobId: UUID?, payload: ServiceInstantiation, optimisticUniqueServiceInstanceName: String): String? {
- var serviceInstanceName: String? = null
- if (StringUtils.isNotEmpty(optimisticUniqueServiceInstanceName)) {
- serviceInstanceName = peekServiceName(jobId, payload, optimisticUniqueServiceInstanceName)
+ var serviceInstanceName: String
+ if (StringUtils.isEmpty(optimisticUniqueServiceInstanceName)) {
+ serviceInstanceName = payload.modelInfo.modelName
+ } else {
+ serviceInstanceName = optimisticUniqueServiceInstanceName
}
- return serviceInstanceName
+ return peekServiceName(jobId, payload, serviceInstanceName)
}
private fun peekServiceName(jobId: UUID?, payload: ServiceInstantiation, optimisticUniqueServiceInstanceName: String): String {
if (isNameFreeInAai(optimisticUniqueServiceInstanceName, ResourceType.SERVICE_INSTANCE)) {
serviceInstanceName = optimisticUniqueServiceInstanceName
} else {
- serviceInstanceName = asyncInstantiationBL.getUniqueName(payload.instanceName, ResourceType.SERVICE_INSTANCE)
+ serviceInstanceName = asyncInstantiationBL.getUniqueName(optimisticUniqueServiceInstanceName, ResourceType.SERVICE_INSTANCE)
}//otherwise we used the original service instance name (from payload) to get a new unique name from DB and AAI
//update serviceInfo with new name if needed
"globalSubscriberId": "{some subscriber id}"
},
"requestInfo": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"source": "VID",
"suppressRollback": false,
"aLaCarte": false,
"userParams": [{
"service": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"modelInfo": {
"modelType": "service",
"modelName": "MOW AVPN vMX BV vPE 1 Service",
]
}
}
-}
\ No newline at end of file
+}
"globalSubscriberId": "{some subscriber id}"
},
"requestInfo": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"source": "VID",
"suppressRollback": false,
"aLaCarte": false,
"userParams": [{
"service": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"modelInfo": {
"modelType": "service",
"modelName": "MOW AVPN vMX BV vPE 1 Service",
}]
}
}
-}
\ No newline at end of file
+}
"globalSubscriberId": "{some subscriber id}"
},
"requestInfo": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"source": "VID",
"suppressRollback": false,
"aLaCarte": false,
"userParams": [{
"service": {
+ "instanceName": "MOW AVPN vMX BV vPE 1 Service",
"modelInfo": {
"modelType": "service",
"modelName": "MOW AVPN vMX BV vPE 1 Service",
}]
}
}
-}
\ No newline at end of file
+}