* Added example yang to affinity project at the correct location (src/main/yang).

* Fixed a few missing dependencies for yang bundles in pom.xml.

Signed-off-by: Suchi Raman <suchi.raman@plexxi.com>

diff --git a/affinity/api/META-INF/MANIFEST.MF b/affinity/api/META-INF/MANIFEST.MF
index e0f1ac88190277774e14e02bc43ed3076fcdfea1..6fb6a84d12060090d759d607710301676f9952e3 100644 (file)
--- a/affinity/api/META-INF/MANIFEST.MF
+++ b/affinity/api/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1379351585099\r
+Bnd-LastModified: 1379352877491\r
 Build-Jdk: 1.7.0_25\r
 Built-By: sraman\r
 Bundle-ManifestVersion: 2\r

diff --git a/affinity/implementation/META-INF/MANIFEST.MF b/affinity/implementation/META-INF/MANIFEST.MF
index c85ee6658a706d88e9ea7f92fa71a420b1d683a9..31d9ef9fada137424ffdaf53b8c2b3dc04ae9b40 100644 (file)
--- a/affinity/implementation/META-INF/MANIFEST.MF
+++ b/affinity/implementation/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1379351587745\r
+Bnd-LastModified: 1379352879843\r
 Build-Jdk: 1.7.0_25\r
 Built-By: sraman\r
 Bundle-Activator: org.opendaylight.controller.affinity.internal.Activato\r

diff --git a/affinity/northbound/src/main/resources/META-INF/MANIFEST.MF b/affinity/northbound/src/main/resources/META-INF/MANIFEST.MF
index d7060c04888c2e4539d382548ce93885a5b6cff2..c2083bdd50ea0fcc3e20b982803c5dd94244a04e 100644 (file)
--- a/affinity/northbound/src/main/resources/META-INF/MANIFEST.MF
+++ b/affinity/northbound/src/main/resources/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1379351589195\r
+Bnd-LastModified: 1379352880879\r
 Build-Jdk: 1.7.0_25\r
 Built-By: sraman\r
 Bundle-ManifestVersion: 2\r

diff --git a/pom.xml b/pom.xml
index fa66280596c7e3d5011b40fbe1259f36ec9351db..da297d61310de1332cbd16bb9376aa9740a77bed 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -109,11 +109,6 @@
             <scope>test</scope>\r
             <optional>true</optional>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.slf4j</groupId>\r
-            <artifactId>slf4j-api</artifactId>\r
-            <version>1.7.2</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.slf4j</groupId>\r
             <artifactId>slf4j-simple</artifactId>\r
@@ -129,6 +124,22 @@
            <artifactId>yang-common</artifactId>\r
            <version>0.5.7-SNAPSHOT</version>\r
        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools.model</groupId>\r
+            <artifactId>ietf-inet-types</artifactId>\r
+            <version>2010.09.24-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools.model</groupId>\r
+            <artifactId>ietf-yang-types</artifactId>\r
+            <version>2010.09.24-SNAPSHOT</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.opendaylight.yangtools</groupId>\r
+            <artifactId>yang-ext</artifactId>\r
+            <version>2013.09.07-SNAPSHOT</version>\r
+        </dependency>\r
+       \r
     </dependencies>\r
 \r
   <build>\r

diff --git a/src/main/yang/affinity-topology.yang b/src/main/yang/affinity-topology.yang
new file mode 100644 (file)
index 0000000..426abb0
--- /dev/null
+++ b/src/main/yang/affinity-topology.yang
@@ -0,0 +1,94 @@
+module affinity-topology { 
+    namespace "urn:opendaylight:affinity";
+    prefix affinity;
+
+    import ietf-inet-types { prefix inet; }
+    import ietf-yang-types { prefix yang; }
+    import yang-ext { prefix ext; }
+
+    revision "2013-09-16" {
+        description "Initial revision of affinity model";
+    }
+
+    typedef affinity-group-ref {
+       type instance-identifier;
+    }
+
+    typedef affinity-link-ref {
+       type instance-identifier;
+    }
+
+    grouping affinity-group {
+       leaf id {
+           type string;
+       }       
+       list affinity-identifier {
+           key id;
+           leaf id {
+               type string;
+           }
+           leaf address {
+               description "Mac or Inet address";
+               type union {
+                   type inet:ip-address;
+                   type yang:mac-address;
+               }
+           }
+       }
+    }
+
+    grouping affinity-link {
+       leaf id {
+           type string;
+       }
+       leaf from-affinity-group {
+           type affinity-group-ref;
+       }
+       leaf to-affinity-group {
+           type affinity-group-ref;
+       }
+       leaf attribute {
+           type string;
+       }
+    }
+
+    identity affinity-group-context {
+       description "Identity used to mark affinity-group context";
+    }
+    identity affinity-link-context {
+       description "Identity used to mark affinity-link context";
+    }
+
+    container affinity-topology {
+       list affinity-group {
+           key id;
+           ext:context-instance "affinity-group-context";
+           uses affinity-group;
+       }
+       list affinity-link {
+           key id;
+           ext:context-instance "affinity-link-context";
+           uses affinity-link;
+       }
+    }
+
+    rpc get-affinity-groups {
+       output {
+           list affinity-group {
+               key id;
+               uses affinity-group;
+           }
+       }
+    }
+    rpc get-affinity-links {
+       
+    }
+    rpc get-affinity-group {
+       
+    }
+    rpc get-affinity-link {
+       
+    }
+}
+
+