mappingservice/integrationtest/src/test/resources/mdsal-controller-diff.patch

   1 diff --git a/mappingservice/integrationtest/../../../controller/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml b/mappingservice/integrationtest/src/test/resources/controller.xml
   2 index 7bfe254..ff2c0be 100644
   3 --- a/mappingservice/integrationtest/../../../controller/opendaylight/md-sal/sal-binding-it/src/test/resources/controller.xml
   4 +++ b/mappingservice/integrationtest/src/test/resources/controller.xml
   5 @@ -31,6 +31,7 @@
   6                  <capability>
   7                      urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&amp;revision=2013-10-28
   8                  </capability>
   9 +                <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm-mappingservice-sb:impl?module=lfm-mappingservice-sb-impl&amp;revision=2015-05-17</capability>
  10
  11              </required-capabilities>
  12              <configuration>
  13 @@ -76,14 +77,6 @@
  14                  <module>
  15                              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-notification-broker</type>
  16                              <name>binding-notification-broker</name>
  17 -                    <notification-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
  18 -                         <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-new-notification-service</type>
  19 -                         <name>binding-notification-adapter</name>
  20 -                    </notification-adapter>
  21 -                    <notification-publish-adapter xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
  22 -                         <type  xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-new-notification-publish-service</type>
  23 -                         <name>binding-notification-publish-adapter</name>
  24 -                    </notification-publish-adapter>
  25                          </module>
  26                          <module>
  27                              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">prefix:binding-broker-impl</type>
  28 @@ -170,21 +163,10 @@
  29                          <module>
  30                              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-inmemory-data-broker</type>
  31                              <name>inmemory-data-broker</name>
  32 -
  33                              <schema-service>
  34                                  <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
  35                                  <name>yang-schema-service</name>
  36                              </schema-service>
  37 -
  38 -                   <config-data-store>
  39 -                        <type xmlns:config-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:config-dom-store">config-dom-store-spi:config-dom-datastore</type>
  40 -                        <name>config-store-service</name>
  41 -                    </config-data-store>
  42 -
  43 -                    <operational-data-store>
  44 -                        <type xmlns:operational-dom-store-spi="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store">operational-dom-store-spi:operational-dom-datastore</type>
  45 -                        <name>operational-store-service</name>
  46 -                    </operational-data-store>
  47                          </module>
  48                          <module>
  49                              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">prefix:dom-broker-impl</type>
  50 @@ -222,6 +204,34 @@
  51                                  </binding-mapping-service>
  52                              </binding-forwarded-data-broker>
  53                          </module>
  54 +                        <!-- lfm mappingservice southbound -->
  55 +                        <module>
  56 +                          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm-mappingservice-sb:impl">
  57 +                            prefix:lfm-mappingservice-sb-impl
  58 +                          </type>
  59 +                          <name>lfm-mappingservice-sb-impl-default</name>
  60 +
  61 +                          <rpc-registry>
  62 +                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
  63 +                              binding:binding-rpc-registry
  64 +                            </type>
  65 +                            <name>binding-rpc-broker</name>
  66 +                          </rpc-registry>
  67 +
  68 +                          <broker>
  69 +                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
  70 +                              binding:binding-broker-osgi-registry
  71 +                            </type>
  72 +                            <name>binding-osgi-broker</name>
  73 +                          </broker>
  74 +
  75 +                          <notification-service>
  76 +                            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
  77 +                              binding:binding-notification-service
  78 +                            </type>
  79 +                            <name>binding-notification-broker</name>
  80 +                          </notification-service>
  81 +                        </module>
  82                      </modules>
  83
  84                      <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
  85 @@ -329,6 +339,14 @@
  86                                  <provider>/modules/module[type='pingpong-data-broker'][name='pingpong-data-broker']</provider>
  87                              </instance>
  88                          </service>
  89 +                        <!-- lfm mappingservice southbound -->
  90 +                        <service>
  91 +                          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm-mappingservice-sb:impl">prefix:lfm-mappingservice-sb</type>
  92 +                          <instance>
  93 +                            <name>lfm-mappingservice-sb</name>
  94 +                            <provider>/modules/module[type='lfm-mappingservice-sb-impl'][name='lfm-mappingservice-sb-impl-default']</provider>
  95 +                          </instance>
  96 +                        </service>
  97                      </services>
  98                  </data>
  99