Add VPNaaS related test cases

[neutron.git] / transcriber / src / main / java / org / opendaylight / neutron / transcriber / NeutronVPNServiceInterface.java

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNServiceInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNServiceInterface.java
index e9ef6d42731eab34e56e5eb28bbdad5b37ea9448..108ee054b8e1f9946dfe903160a73769573d41a6 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNServiceInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronVPNServiceInterface.java
@@ -1,5 +1,5 @@
 /*
- * Copyright Tata Consultancy Services, 2015.  All rights reserved.
+ * Copyright (c) 2015 Tata Consultancy Services and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -19,16 +19,17 @@ import java.util.concurrent.ConcurrentMap;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.neutron.spi.INeutronVPNServiceCRUD;
 import org.opendaylight.neutron.spi.NeutronVPNService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.VpnServices;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.vpn.services.VpnService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnaas.attributes.vpn.services.VpnServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnservices.attributes.VpnServices;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnservices.attributes.vpn.services.Vpnservice;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.vpnaas.rev141002.vpnservices.attributes.vpn.services.VpnserviceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150325.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class NeutronVPNServiceInterface extends AbstractNeutronInterface<VpnService,NeutronVPNService> implements INeutronVPNServiceCRUD {
+public class NeutronVPNServiceInterface extends AbstractNeutronInterface<Vpnservice,NeutronVPNService> implements INeutronVPNServiceCRUD {
     private static final Logger LOGGER = LoggerFactory.getLogger(NeutronVPNServiceInterface.class);
     private ConcurrentMap<String, NeutronVPNService> vpnServiceDB = new ConcurrentHashMap<String, NeutronVPNService>();
 
@@ -103,8 +104,8 @@ public class NeutronVPNServiceInterface extends AbstractNeutronInterface<VpnServ
     }
 
     @Override
-    protected VpnService toMd(NeutronVPNService vpnService) {
-        VpnServiceBuilder vpnServiceBuilder = new VpnServiceBuilder();
+    protected Vpnservice toMd(NeutronVPNService vpnService) {
+        VpnserviceBuilder vpnServiceBuilder = new VpnserviceBuilder();
         if (vpnService.getName() != null) {
             vpnServiceBuilder.setName(vpnService.getName());
         }
@@ -133,20 +134,22 @@ public class NeutronVPNServiceInterface extends AbstractNeutronInterface<VpnServ
     }
 
     @Override
-    protected InstanceIdentifier<VpnService> createInstanceIdentifier(VpnService vpnService) {
-        return InstanceIdentifier.create(VpnServices.class).child(VpnService.class, vpnService.getKey());
+    protected InstanceIdentifier<Vpnservice> createInstanceIdentifier(Vpnservice vpnService) {
+        return InstanceIdentifier.create(Neutron.class)
+                 .child(VpnServices.class)
+                 .child(Vpnservice.class, vpnService.getKey());
     }
 
     @Override
-    protected VpnService toMd(String uuid) {
-        VpnServiceBuilder vpnServiceBuilder = new VpnServiceBuilder();
+    protected Vpnservice toMd(String uuid) {
+        VpnserviceBuilder vpnServiceBuilder = new VpnserviceBuilder();
         vpnServiceBuilder.setUuid(toUuid(uuid));
         return vpnServiceBuilder.build();
     }
 
     public static void registerNewInterface(BundleContext context,
                                             ProviderContext providerContext,
-                                            List<ServiceRegistration<?>> registrations) throws Exception {
+                                            List<ServiceRegistration<?>> registrations) {
         NeutronVPNServiceInterface neutronVPNServiceInterface = new NeutronVPNServiceInterface(providerContext);
         ServiceRegistration<INeutronVPNServiceCRUD> neutronVPNServiceInterfaceRegistration = context.registerService(INeutronVPNServiceCRUD.class, neutronVPNServiceInterface, null);
         if(neutronVPNServiceInterfaceRegistration != null) {