Small revision to affinity pom to get affinity yang model to build.

Initial yang model for analytics.  Currently the yang model is *not* used (the .java files will not be generated when you build)

Signed-off-by: Katrina LaCurts <katrina.lacurts@plexxi.com>

diff --git a/affinity/yang/pom.xml b/affinity/yang/pom.xml
index a03171b78ff2c7bce3584cfc53c3cca63ace4d2e..0b9c8683f8b9121741bc51be5a67b4e4f8351634 100644 (file)
--- a/affinity/yang/pom.xml
+++ b/affinity/yang/pom.xml
@@ -19,7 +19,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <yang.version>0.5.8-SNAPSHOT</yang.version>
+        <yang.version>0.5.9-SNAPSHOT</yang.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
@@ -193,11 +193,11 @@
         <artifactId>ietf-yang-types</artifactId>
         <version>2010.09.24-SNAPSHOT</version>
       </dependency>
-      <dependency>
+<!--      <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yang-ext</artifactId>
         <version>2013.09.07-SNAPSHOT</version>
-      </dependency>
+      </dependency>-->
     </dependencies>
 
 </project>

diff --git a/analytics/implementation/pom.xml b/analytics/implementation/pom.xml
index 271b66b808d3da5afddb2d7e0be751fdaa83739f..815a30e8bd478d9e058ba82a91c9a0f24e2c2880 100644 (file)
--- a/analytics/implementation/pom.xml
+++ b/analytics/implementation/pom.xml
@@ -15,6 +15,25 @@
   <version>0.4.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <yang.version>0.5.9-SNAPSHOT</yang.version>
+  </properties>
+
+  <repositories>
+    <!-- OpenDayLight Released artifact -->
+    <repository>
+      <id>opendaylight-release</id>
+      <name>opendaylight-release</name>
+      <url>${nexusproxy}/repositories/opendaylight.release/</url>
+    </repository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <repository>
+      <id>opendaylight-snapshot</id>
+      <name>opendaylight-snapshot</name>
+      <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+    </repository>
+  </repositories>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -78,6 +97,61 @@
           </execution>
         </executions>
       </plugin>
+      <!-- START YANG -->
+      <plugin>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-maven-plugin</artifactId>
+        <version>0.5.9-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <goals>
+              <!-- Uncomment out the next line to use the yang model -->
+<!--              <goal>generate-sources</goal> -->
+            </goals>
+            <configuration>
+              <yangFilesRootDir>src/main/yang</yangFilesRootDir>
+              <codeGenerators>
+                <generator>
+                  <codeGeneratorClass>
+                    org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
+                  </codeGeneratorClass>
+                  <outputBaseDir>
+                    target/generated-sources/sal
+                  </outputBaseDir>
+                </generator>
+              </codeGenerators>
+              <inspectDependencies>false</inspectDependencies>
+            </configuration>
+          </execution>
+        </executions>        
+        <dependencies>
+          <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>maven-sal-api-gen-plugin</artifactId>
+            <version>0.6.0-SNAPSHOT</version>
+            <type>jar</type>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>target/generated-sources/sal</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- END YANG -->
     </plugins>
   </build>
   <dependencies>
@@ -117,5 +191,27 @@
       <artifactId>statisticsmanager</artifactId>
       <version>0.4.0-SNAPSHOT</version>
     </dependency>
+    <!-- START YANG -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+      <version>${yang.version}</version>
+    </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-common</artifactId>
+        <version>${yang.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>ietf-inet-types</artifactId>
+        <version>2010.09.24-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools.model</groupId>
+        <artifactId>ietf-yang-types</artifactId>
+        <version>2010.09.24-SNAPSHOT</version>
+      </dependency>
+    <!-- END YANG -->
   </dependencies>
 </project>

diff --git a/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
index ac7c152f4bb508c218510a0e70f51f7b2b34a667..fa651f12cc17b6cd7379cd23eaf235b162e62636 100644 (file)
--- a/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
+++ b/analytics/implementation/src/main/java/org/opendaylight/affinity/analytics/internal/AnalyticsManager.java
@@ -44,6 +44,9 @@ import org.opendaylight.controller.sal.reader.NodeTableStatistics;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.statisticsmanager.IStatisticsManager;
 
+// TODO: get "analytics" somewhere in this namespace
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.affinity.rev131016.HostStatistics;
+
 public class AnalyticsManager implements IReadServiceListener, IAnalyticsManager {
 
     private static final Logger log = LoggerFactory.getLogger(AnalyticsManager.class);

diff --git a/analytics/implementation/src/main/yang/analytics.yang b/analytics/implementation/src/main/yang/analytics.yang
new file mode 100644 (file)
index 0000000..69c55f6
--- /dev/null
+++ b/analytics/implementation/src/main/yang/analytics.yang
@@ -0,0 +1,13 @@
+module analytics-model { 
+  namespace "urn:opendaylight:affinity"; // TODO: Change?
+  prefix affinity; // TODO: Change?
+
+  revision "2013-10-16" { description "Initial revision of analytics model"; }
+
+  grouping host-statistics {
+    leaf byte-count { type uint64; }
+    leaf duration {
+      type decimal64 { fraction-digits 2; } // TODO: More?
+    }
+  }
+}
\ No newline at end of file