From 0437a05104ffd36e6700f0321d54ed814d3c7618 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 11 Aug 2023 16:37:41 -0400 Subject: Updates for ODL Argon Updated to use Montreal / ODL Argon version of parent poms, and updated code to create containers to comply with separation of operational and config update transactions imposed in Argon. Issue-ID: SDNC-1816 Signed-off-by: Dan Timoney Change-Id: I65c40896e57b681fa8907eee5d84e8a20e490577 --- .../sdnc/northbound/GenericResourceApiProvider.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java') diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java index 7eb4f2b0..a8f1ee9c 100644 --- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java +++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java @@ -226,23 +226,29 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC private void createContainers() { - final WriteTransaction t = dataBroker.newReadWriteTransaction(); + final WriteTransaction configT = dataBroker.newReadWriteTransaction(); + final WriteTransaction operT = dataBroker.newReadWriteTransaction(); + + // Create the service-instance container - t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class), + configT.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class), new ServicesBuilder().build()); - t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class), + operT.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class), new ServicesBuilder().build()); // Create the PreloadInformation container - t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadInformation.class), + configT.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadInformation.class), new PreloadInformationBuilder().build()); - t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadInformation.class), + operT.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadInformation.class), new PreloadInformationBuilder().build()); try { - FluentFuture checkedFuture = t.commit(); - checkedFuture.get(); + FluentFuture configCheckedFuture = configT.commit(); + configCheckedFuture.get(); + FluentFuture operCheckedFuture = operT.commit(); + operCheckedFuture.get(); + log.info("Create containers succeeded!"); } catch (InterruptedException | ExecutionException e) { -- cgit 1.2.3-korg