X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fprovider%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fsdnc%2Fnorthbound%2Futil%2FMDSALUtil.java;h=ef11e128e9c7062e2b3d5ee1e6f34718c7feacc8;hb=894476cd13c0045d8ce44bf77f1729a3f44c0e10;hp=11610659788beabbebd943137a84a133bd2272d8;hpb=e3446fcf2129c07af960e6b327c06f585c48ea68;p=sdnc%2Fnorthbound.git

diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
index 11610659..ef11e128 100644
--- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
+++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/util/MDSALUtil.java
@@ -21,27 +21,39 @@
 
 package org.onap.sdnc.northbound.util;
 
+import java.util.concurrent.Future;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.contrail.route.response.information.ContrailRouteResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.information.NetworkInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeaderBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.security.zone.response.information.SecurityZoneResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.information.ServiceInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.level.oper.status.ServiceLevelOperStatusBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.ServiceBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.response.information.ServiceResponseInformationBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.information.VfModuleInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.information.VnfInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.response.information.VnfResponseInformationBuilder;
 import org.opendaylight.yangtools.concepts.Builder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
-import java.util.concurrent.Future;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
 
 /**
  * This uill class provides utility to build yang objects using a recursive syntax that resembles the tree structure
@@ -70,12 +82,43 @@ import java.util.function.Function;
  */
 public class MDSALUtil {
 
+    public static SecurityZoneTopologyOperationInputBuilder securityZoneTopologyOperationInput() {
+        return new SecurityZoneTopologyOperationInputBuilder();
+    }
+
+    public static SecurityZoneTopologyOperationOutputBuilder securityZoneTopologyOperationOutput() {
+        return new SecurityZoneTopologyOperationOutputBuilder();
+    }
+
+    public static ContrailRouteTopologyOperationInputBuilder contrailRouteTopologyOperationInput() {
+        return new ContrailRouteTopologyOperationInputBuilder();
+    }
+
+    public static ContrailRouteTopologyOperationOutputBuilder contrailRouteTopologyOperationOutput() {
+        return new ContrailRouteTopologyOperationOutputBuilder();
+    }
+
+    public static VfModuleTopologyOperationInputBuilder vfModuleTopologyOperationInput() {
+        return new VfModuleTopologyOperationInputBuilder();
+    }
+
+    public static VfModuleTopologyOperationOutputBuilder vfModuleTopologyOperationOutput() {
+        return new VfModuleTopologyOperationOutputBuilder();
+    }
+
+    public static VnfTopologyOperationInputBuilder vnfTopologyOperationInput() {
+        return new VnfTopologyOperationInputBuilder();
+    }
+
+    public static VnfTopologyOperationOutputBuilder vnfTopologyOperationOutput() {
+        return new VnfTopologyOperationOutputBuilder();
+    }
+
     public static ServiceTopologyOperationInputBuilder serviceTopologyOperationInput() {
         return new ServiceTopologyOperationInputBuilder();
     }
 
-
-    public static ServiceTopologyOperationOutputBuilder serviceTopologyOperationOutput(){
+    public static ServiceTopologyOperationOutputBuilder serviceTopologyOperationOutput() {
         return new ServiceTopologyOperationOutputBuilder();
     }
 
@@ -89,47 +132,83 @@ public class MDSALUtil {
         return new RequestInformationBuilder();
     }
 
-    public static ServiceResponseInformationBuilder serviceResponseInformation(){
-        return  new ServiceResponseInformationBuilder();
+    public static ServiceResponseInformationBuilder serviceResponseInformation() {
+        return new ServiceResponseInformationBuilder();
+    }
+
+    public static SecurityZoneResponseInformationBuilder securityZoneResponseInformation() {
+        return new SecurityZoneResponseInformationBuilder();
+    }
+
+    public static ContrailRouteResponseInformationBuilder contrailRouteResponseInformation() {
+        return new ContrailRouteResponseInformationBuilder();
+    }
+
+    public static VnfResponseInformationBuilder vnfResponseInformation() {
+        return new VnfResponseInformationBuilder();
     }
 
     public static ServiceInformationBuilder serviceInformationBuilder() {
-        return  new ServiceInformationBuilder();
+        return new ServiceInformationBuilder();
+    }
+
+    public static VnfInformationBuilder vnfInformationBuilder() {
+        return new VnfInformationBuilder();
     }
 
+    public static VfModuleInformationBuilder vfModuleInformationBuilder() {
+        return new VfModuleInformationBuilder();
+    }
 
-    public static ServiceBuilder service(){return new ServiceBuilder();}
+    public static ServiceBuilder service() {
+        return new ServiceBuilder();
+    }
 
 
-    public static ServiceDataBuilder serviceData(){return new ServiceDataBuilder();}
+    public static ServiceDataBuilder serviceData() {
+        return new ServiceDataBuilder();
+    }
 
 
-    public static ServiceStatusBuilder serviceStatus(){return new ServiceStatusBuilder();}
+    public static ServiceStatusBuilder serviceStatus() {
+        return new ServiceStatusBuilder();
+    }
 
-    public static NetworkInformationBuilder networkInformation(){return new NetworkInformationBuilder();}
+    public static NetworkInformationBuilder networkInformation() {
+        return new NetworkInformationBuilder();
+    }
 
-    public static NetworkTopologyOperationInputBuilder networkTopologyOperationInput() {return new NetworkTopologyOperationInputBuilder();}
+    public static NetworkTopologyOperationInputBuilder networkTopologyOperationInput() {
+        return new NetworkTopologyOperationInputBuilder();
+    }
 
-    public static NetworkTopologyOperationOutputBuilder networkTopologyOperationOutput() {return new NetworkTopologyOperationOutputBuilder();}
+    public static NetworkTopologyOperationOutputBuilder networkTopologyOperationOutput() {
+        return new NetworkTopologyOperationOutputBuilder();
+    }
 
-    public static NetworkResponseInformationBuilder networkResponseInformation(){return new NetworkResponseInformationBuilder();}
+    public static NetworkResponseInformationBuilder networkResponseInformation() {
+        return new NetworkResponseInformationBuilder();
+    }
 
-    public static ServiceLevelOperStatusBuilder serviceLevelOperStatus() {return new ServiceLevelOperStatusBuilder();}
+    public static ServiceLevelOperStatusBuilder serviceLevelOperStatus() {
+        return new ServiceLevelOperStatusBuilder();
+    }
 
     public static <P> P build(Builder<P> b) {
-        return b == null? null :b.build();
+        return b == null ? null : b.build();
     }
 
-    public static <P,B extends Builder<P>> P build(Function<P,B> builderConstructor,P sourceDataObject){
-        if(sourceDataObject == null){
+    public static <P, B extends Builder<P>> P build(Function<P, B> builderConstructor, P sourceDataObject) {
+        if (sourceDataObject == null) {
             return null;
         }
         B bp = builderConstructor.apply(sourceDataObject);
         return bp.build();
     }
 
-    public static <P,B extends Builder<P>> P build(Function<P,B> builderConstructor,P sourceDataObject,Consumer<B> builder){
-        if(sourceDataObject == null){
+    public static <P, B extends Builder<P>> P build(Function<P, B> builderConstructor, P sourceDataObject,
+        Consumer<B> builder) {
+        if (sourceDataObject == null) {
             return null;
         }
         B bp = builderConstructor.apply(sourceDataObject);
@@ -137,7 +216,8 @@ public class MDSALUtil {
         return bp.build();
     }
 
-    public static <I,O> O exec(Function<I,Future<RpcResult<O>>> rpc,I rpcParameter,Function<RpcResult<O>,O> rpcResult)  throws Exception {
+    public static <I, O> O exec(Function<I, Future<RpcResult<O>>> rpc, I rpcParameter,
+        Function<RpcResult<O>, O> rpcResult) throws Exception {
         Future<RpcResult<O>> future = rpc.apply(rpcParameter);
         return rpcResult.apply(future.get());
     }