Update yang models and corresponding modules to ensure no conflicts

Change-Id: I17a6b0f16fb4ed1c3e4a6e0036d8589a04bf6925
Signed-off-by: Xin Li <yakumolx@gmail.com>

diff --git a/.gitignore b/.gitignore
index 4817d90365bc1577dcd9baa44a2d36ddc12c512c..24c86eddd6c375ec1f0456017f65cfb27c0ca46e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.class
+*.swp
 **/target
 bin/
 dist

diff --git a/alto-commons/src/main/java/org/opendaylight/alto/commons/types/alto/model/rev150404/MediaType.java b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/alto/model/rev150404/MediaType.java
new file mode 100644 (file)
index 0000000..b8cf48e
--- /dev/null
+++ b/alto-commons/src/main/java/org/opendaylight/alto/commons/types/alto/model/rev150404/MediaType.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015 Yale University 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.alto.commons.types.alto.model.rev150404;
+
+class MediaType {
+
+    /** The media types generated by alto-model
+     * */
+
+    public static final String ALTO_DIRECTORY
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoDirectory
+                                ).toString();
+
+    public static final String ALTO_NETWORKMAP
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoNetworkmap
+                                ).toString();
+
+    public static final String ALTO_NETWORKMAP_FILTER
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoNetworkmapfilter
+                                ).toString();
+
+    public static final String ALTO_COSTMAP
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoCostmap
+                                ).toString();
+
+    public static final String ALTO_COSTMAP_FILTER
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoCostmapfilter
+                                ).toString();
+
+    public static final String ALTO_ENDPOINT_PROP
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoEndpointprop
+                                ).toString();
+
+    public static final String ALTO_ENDPOINT_PROPPARAMS
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoEndpointpropparams
+                                ).toString();
+
+    public static final String ALTO_ENDPOINT_COST
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoEndpointcost
+                                ).toString();
+
+    public static final String ALTO_ENDPOST_COSTPARAMS
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoEndpointcostparams
+                                ).toString();
+
+    public static final String ALTO_ERROR
+                            = new org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType(
+                                    org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType.Enumeration.AltoError
+                                ).toString();
+
+}

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/CostMetricBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/CostMetricBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/CostMetricBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/CostMetricBuilder.java
index 9e70be946c286748eec3d5aecd4d0baba62cfe1a..c44d6b48c543ca864cde6c9293a61a2b0da7d23c 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/CostMetricBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/CostMetricBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointAddressTypeBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointAddressTypeBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointAddressTypeBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointAddressTypeBuilder.java
index 6ce01100ef6e82e0e09c7c5ae83c7872f057a510..5c5e6f85ff8ce70a3faa2503873258b569914d74 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointAddressTypeBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointAddressTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointPropertyTypeBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointPropertyTypeBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointPropertyTypeBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointPropertyTypeBuilder.java
index 3932a6a82a0768adcc74162a614a0e478247d0a1..3b87076df0686a5a7c4ae77c2f1ef4606e9382b1 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/EndpointPropertyTypeBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/EndpointPropertyTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/GlobalEndpointPropertyBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/GlobalEndpointPropertyBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/GlobalEndpointPropertyBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/GlobalEndpointPropertyBuilder.java
index 5b7d858f20b39c2d45ca75078e244f4a475b591d..b562af8168bc16f4fa8a5ad7a80168f62b6d0c5c 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/GlobalEndpointPropertyBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/GlobalEndpointPropertyBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/MediaTypeBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/MediaTypeBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/MediaTypeBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/MediaTypeBuilder.java
index a47f20fe6c4db5a7f474b30b836f5411b9be95de..f87df12898f3c566569e7f2a395950f6b5fddcef 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/MediaTypeBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/MediaTypeBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/TypedEndpointAddressBuilder.java b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/TypedEndpointAddressBuilder.java
similarity index 97%
rename from alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/TypedEndpointAddressBuilder.java
rename to alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/TypedEndpointAddressBuilder.java
index aaf8de3d6f8208575398e6e155174191461c0163..614388f5797848c7508dd72062b0ea7f68ae9538 100644 (file)
--- a/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev141101/TypedEndpointAddressBuilder.java
+++ b/alto-model/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/service/types/rev150404/TypedEndpointAddressBuilder.java
@@ -1,4 +1,4 @@
-package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101;
+package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404;
 
 
 /**

diff --git a/alto-model/src/main/yang/alto-service-did.yang b/alto-model/src/main/yang/alto-service-did.yang
deleted file mode 100644 (file)
index 1ea255e..0000000
--- a/alto-model/src/main/yang/alto-service-did.yang
+++ /dev/null
@@ -1,132 +0,0 @@
-module alto-service-did {
-  yang-version 1;
-
-  namespace "urn:opendaylight:alto-service-did";
-  // TODO: replace with IANA namespace when assigned
-
-  prefix "as-did";
-
-  import alto-service-types {
-    prefix alto;
-  }
-
-  organization "ALTO WG";
-  contact "alto@ietf.org";
-
-  description
-    "This module defines the data instance descriptions (DID) of a
-     semantically equivalent data model for the ALTO services
-     defined in RFC7285.";
-
-  revision 2014-11-01 {
-    description "Inherit from alto-service-rpc and types.";
-  }
-
-  revision 2014-10-24 {
-    description "Initial version.";
-  }
-
-  /******************************************
-    Groupings for ALTO information resource
-  *******************************************/
-
-  grouping network-map-data {
-    list map {
-      key "pid";
-      leaf pid {
-        type alto:pid-name;
-      }
-      uses alto:endpoint-address-group;
-    }
-  }
-
-  /* Network Map Grouping */
-  grouping network-map {
-    leaf resource-id {
-      type alto:resource-id;
-      mandatory true;
-    }
-    leaf tag {
-      type alto:tag-string;
-      mandatory true;
-    }
-    uses network-map-data;
-  }
-
-  grouping cost-map-data {
-    list map {
-      leaf src {
-        type alto:pid-name;
-      }
-      key "src";
-      list dst-costs {
-        leaf dst {
-          type alto:pid-name;
-        }
-        key "dst";
-        uses alto:alto-cost;
-      }
-    }
-  }
-
-  /* Cost Map Grouping */
-  grouping cost-map {
-    leaf resource-id {
-      type alto:resource-id;
-      mandatory true;
-    }
-    leaf tag {
-      type alto:tag-string;
-      mandatory true;
-    }
-    container meta {
-      must "current()";
-      uses alto:cost-map-meta;
-    }
-    uses cost-map-data;
-  }
-
-  grouping alto-resources {
-    container IRD {
-      config false;
-      uses alto:IRD;
-    }
-
-    container network-maps {
-      config false;
-      list network-map {
-        key "resource-id";
-        uses network-map;
-      }
-    }
-
-    container cost-maps {
-      config false;
-      list cost-map {
-        key "resource-id";
-        uses cost-map;
-      }
-    }
-
-    container endpoint-property-map {
-      config false;
-      uses alto:endpoint-property-map;
-    }
-  }
-
-  /****************************************************
-     DATA INSTANCES of all ALTO information resources
-
-     unfiltered network-maps, unfiltered cost-maps are all instances
-     of resources. IRD is also modeled as data.
-
-     The design uses augment as the basic approach to implement
-     inheritance.
-   ****************************************************/
-/*
-  container resources {
-    config false;
-    uses alto-resources;
-  }
-*/
-}

diff --git a/alto-model/src/main/yang/alto-service-types.yang b/alto-model/src/main/yang/alto-service-types.yang
index fa96093a9bb8d52d8285871c23d3433f49a17aac..8b38a8fe599ae1800e8f39637d08165aa34c4c0e 100644 (file)
--- a/alto-model/src/main/yang/alto-service-types.yang
+++ b/alto-model/src/main/yang/alto-service-types.yang
@@ -17,6 +17,10 @@ module alto-service-types {
     "This module defines the data types and groupings for a semantically
      equivalent data model for the ALTO services defined in RFC7285.";
 
+  revision 2015-04-04 {
+    description "Interop with RFC7285";
+  }
+
   revision 2014-11-01 {
     description "Separate types module";
   }

diff --git a/alto-model/src/main/yang/alto-service.yang b/alto-model/src/main/yang/alto-service.yang
index ba52770296389d98a529c19e598374e95245d01f..8073f7658159dc1927586817f7c1192da2c7cbd8 100644 (file)
--- a/alto-model/src/main/yang/alto-service.yang
+++ b/alto-model/src/main/yang/alto-service.yang
@@ -19,6 +19,10 @@ module alto-service {
     "This module defines a data model for the ALTO services
      using restconf. Note this is not interop with RFC7285.";
 
+  revision 2015-04-04 {
+    description "Fix IRD";
+  }
+
   revision 2014-11-19 {
     description "Initial version for ODL.";
   }
@@ -77,10 +81,7 @@ module alto-service {
     //presence "Indicates that the alto service is available.";
 
     container IRD {
-      container meta {
-        uses alto:IRD-meta;
-      }
-      uses alto:IRD-data;
+      uses alto:IRD;
     }
 
     container network-maps {

diff --git a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
index 83c94ab56f7ade79947104d3246a9ac86024ce56..2534c8afbb177321ca28fceefdc23e6901686d62 100644 (file)
--- a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
+++ b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthbound.java
@@ -9,19 +9,16 @@ package org.opendaylight.alto.northbound;
 
 import org.opendaylight.alto.commons.types.rfc7285.MediaType;
 import org.opendaylight.alto.services.api.IRDService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.IRD;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-//import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.NetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.IRD;
-
-import javax.ws.rs.Path;
 import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
+import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 @Path("/")
 public class AltoNorthbound {
 

diff --git a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthboundRSApplication.java b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthboundRSApplication.java
index f5cfea8927f76df4d0c9c9a63ad01cb10fa53c05..6ab9bc6f4f410ea54ad879345a57a8239381cbb6 100644 (file)
--- a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthboundRSApplication.java
+++ b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/AltoNorthboundRSApplication.java
@@ -1,10 +1,9 @@
 package org.opendaylight.alto.northbound;
 
+import javax.ws.rs.core.Application;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.ws.rs.core.Application;
-
 public class AltoNorthboundRSApplication extends Application {
     @Override
     public Set<Class<?>> getClasses() {

diff --git a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/FakeAltoService.java b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/FakeAltoService.java
index a33cf675bea9f19a1ebd8aeb82b39c97963112df..e699fe85414686078992d9530f40c09221af2681 100644 (file)
--- a/alto-northbound/src/main/java/org/opendaylight/alto/northbound/FakeAltoService.java
+++ b/alto-northbound/src/main/java/org/opendaylight/alto/northbound/FakeAltoService.java
@@ -1,24 +1,24 @@
 package org.opendaylight.alto.northbound;
 
 import org.opendaylight.alto.services.api.IRDService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.IRD;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.did.rev141101.alto.resources.IRDBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ird.MetaBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.cost.types.CostTypes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.cost.types.CostTypesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.cost.types.CostTypesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.CostTypeName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.CostMode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.CostMetric;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ird.data.Resources;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ird.data.ResourcesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ird.data.ResourcesBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.MediaType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.IRD;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.IRDBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.CostTypeName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.CostMetric;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.CostMode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.MediaType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.cost.types.CostTypes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.cost.types.CostTypesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.cost.types.CostTypesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ird.MetaBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ird.data.Resources;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ird.data.ResourcesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ird.data.ResourcesKey;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 class FakeAltoService implements IRDService {
     @Override
@@ -36,7 +36,6 @@ class FakeAltoService implements IRDService {
         cost_types.add(cb.setCostTypeName(name).setCostMetric(metric).setCostMode(mode).setKey(ckey).build());
         irdb.setMeta(mb.setCostTypes(cost_types).build());
 
-
         List<Resources> resources = new ArrayList<Resources>();
         ResourcesBuilder rb = new ResourcesBuilder();
 

diff --git a/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java b/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
index 6119a5f5c4c06a1ad3e50c150001e72a79946150..f03ec86d5721ad962634104360595cdb570777b0 100644 (file)
--- a/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
+++ b/alto-provider/src/main/java/org/opendaylight/controller/config/yang/config/alto_provider/impl/AltoProviderModule.java
@@ -3,7 +3,7 @@ package org.opendaylight.controller.config.yang.config.alto_provider.impl;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.provider.impl.rev141119.OpendaylightAlto;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.AltoServiceService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.AltoServiceService;
 
 public class AltoProviderModule extends org.opendaylight.controller.config.yang.config.alto_provider.impl.AbstractAltoProviderModule {
     public AltoProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {

diff --git a/alto-provider/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/provider/impl/rev141119/OpendaylightAlto.java b/alto-provider/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/provider/impl/rev141119/OpendaylightAlto.java
index 8c7bdaa865f8c103746e072acc52d8ec8daa4409..7d606dd9adbf72a65618a0ab0179ab131d1848cd 100644 (file)
--- a/alto-provider/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/provider/impl/rev141119/OpendaylightAlto.java
+++ b/alto-provider/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/alto/provider/impl/rev141119/OpendaylightAlto.java
@@ -1,13 +1,11 @@
 package org.opendaylight.yang.gen.v1.urn.opendaylight.alto.provider.impl.rev141119;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.atomic.AtomicLong;
-
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.AsyncFunction;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.controller.config.yang.config.alto_provider.impl.AltoProviderRuntimeMXBean;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
@@ -16,49 +14,39 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.*;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.filtered.network.map.service.output.FilteredNetworkMapService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.filtered.network.map.service.output.FilteredNetworkMapServiceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.NetworkMaps;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.NetworkMapsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.resources.network.maps.NetworkMapKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.Map;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev150404.network.map.MapBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.EndpointAddressType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.PidName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.TagString;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.endpoint.address.group.EndpointAddressGroupBuilder;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpPrefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.EndpointCostServiceInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.EndpointCostServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.EndpointPropertyServiceInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.EndpointPropertyServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.FilteredCostMapServiceInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.FilteredCostMapServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.FilteredNetworkMapServiceInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.FilteredNetworkMapServiceOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.FilteredNetworkMapServiceOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.Resources;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.ResourcesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.AltoServiceService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.filtered.network.map.service.output.FilteredNetworkMapService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.filtered.network.map.service.output.FilteredNetworkMapServiceBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.resources.NetworkMaps;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.resources.NetworkMapsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.resources.network.maps.NetworkMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.resources.network.maps.NetworkMapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.rev141119.resources.network.maps.NetworkMapKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.did.rev141101.network.map.data.Map;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.did.rev141101.network.map.data.MapBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.EndpointAddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.PidName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ResourceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.TagString;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.endpoint.address.group.EndpointAddressGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.endpoint.address.group.EndpointAddressGroupBuilder;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.AsyncFunction;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class OpendaylightAlto implements AltoServiceService,
     AltoProviderRuntimeMXBean, DataChangeListener, AutoCloseable {
@@ -119,8 +107,6 @@ public class OpendaylightAlto implements AltoServiceService,
 
     private Resources buildResources() {
         return new ResourcesBuilder().setNetworkMaps(buildDummyNetworkMaps())
-            .setTeststring("TestAltoRestconfDIDWired")
-            .setTestdatastring("tstdatastring")
             .setNetworkMaps(buildDummyNetworkMaps()).build();
     }
 
@@ -270,13 +256,6 @@ public class OpendaylightAlto implements AltoServiceService,
         return null;
     }
 
-    @Override
-    public Future<RpcResult<EndpointPropertyServiceOutput>> endpointPropertyService(
-        EndpointPropertyServiceInput input) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     @Override
     public Future<RpcResult<FilteredCostMapServiceOutput>> filteredCostMapService(
         FilteredCostMapServiceInput input) {

diff --git a/alto-services/api/src/main/java/org/opendaylight/alto/services/api/IRDService.java b/alto-services/api/src/main/java/org/opendaylight/alto/services/api/IRDService.java
index a72f56c9ff53f062a92a2a59ddcf0ec9ee4ca780..2911757752a7c72b64d691e7f97298c8b5d9e15d 100644 (file)
--- a/alto-services/api/src/main/java/org/opendaylight/alto/services/api/IRDService.java
+++ b/alto-services/api/src/main/java/org/opendaylight/alto/services/api/IRDService.java
@@ -1,9 +1,9 @@
 
 package org.opendaylight.alto.services.api;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.IRD;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ird.data.Resources;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev141101.ResourceId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.IRD;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ird.data.Resources;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.alto.service.types.rev150404.ResourceId;
 
 public interface IRDService {