clean some XML files

removes tabs and trailing blanks from various XML files and configs

Change-Id: I903f94d66b639514947cac671628f0a54a42db47
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml
index ff7c44a44419549538ca898e1ce52a8c82c377db..4e73956587ba020e23f8c7db9433628a5536c92f 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -70,8 +70,8 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
     </dependency>
 
     <dependency>
-       <groupId>com.google.code.gson</groupId>
-       <artifactId>gson</artifactId>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/servicehandler/src/main/resources/org/opendaylight/blueprint/Servicehandler-blueprint.xml b/servicehandler/src/main/resources/org/opendaylight/blueprint/Servicehandler-blueprint.xml
index 5f781321d1650d0723dea0c2a69360992f1a4527..7c39e647799c148dcba0b962d44f115de467e99e 100644 (file)
--- a/servicehandler/src/main/resources/org/opendaylight/blueprint/Servicehandler-blueprint.xml
+++ b/servicehandler/src/main/resources/org/opendaylight/blueprint/Servicehandler-blueprint.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- vi: set et smarttab sw=4 tabstop=4: -->\r
-<!--\r
-Copyright © 2017 Orange and others. All rights reserved.\r
-\r
-This program and the accompanying materials are made available under the\r
-terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
-and is available at http://www.eclipse.org/legal/epl-v10.html\r
-\r
-Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange\r
--->\r
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"\r
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"\r
-  odl:use-default-for-reference-types="true">\r
-\r
-       <reference id="rpcRegistry"\r
-               interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>\r
-\r
-       <reference id="dataBroker"\r
-               interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"\r
-               odl:type="default" />\r
-\r
-       <reference id="notificationPublishService"\r
-          interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"\r
-          odl:type="default" />\r
-\r
-       <reference id="notificationService"\r
-          interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"\r
-          odl:type="default" />\r
-\r
-       <bean id="provider"\r
-       class="org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider"\r
-       init-method="init" destroy-method="close">\r
-               <argument ref="rpcRegistry" />\r
-               <argument ref="dataBroker" />\r
-               <argument ref="notificationPublishService" />\r
-               <argument ref="notificationService"/>\r
-       </bean>\r
-</blueprint>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+Copyright © 2017 Orange 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
+
+Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+  odl:use-default-for-reference-types="true">
+
+    <reference id="rpcRegistry"
+        interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
+
+    <reference id="dataBroker"
+        interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+        odl:type="default" />
+
+    <reference id="notificationPublishService"
+          interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+          odl:type="default" />
+
+    <reference id="notificationService"
+          interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"
+          odl:type="default" />
+
+    <bean id="provider"
+    class="org.opendaylight.transportpce.servicehandler.impl.ServicehandlerProvider"
+    init-method="init" destroy-method="close">
+        <argument ref="rpcRegistry" />
+        <argument ref="dataBroker" />
+        <argument ref="notificationPublishService" />
+        <argument ref="notificationService"/>
+    </bean>
+</blueprint>

diff --git a/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl b/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl
index 8eac75f01aedcd864934d96e7535d1060cb304ad..0a8090b5fe80c2e2e409973567fd511e27980ee9 100644 (file)
--- a/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl
+++ b/tests/honeynode/honeynode-plugin-impl/src/main/resources/honeycomb-minimal-resources/config/device/OperToConfig.xsl
@@ -1,155 +1,155 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:stylesheet version="1.0"\r
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
-xmlns:d="urn:ietf:params:xml:ns:netconf:base:1.0"\r
-xmlns:oor="http://org/openroadm/device"\r
-exclude-result-prefixes="oor d">\r
-\r
-  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>\r
-  \r
-  <xsl:template match="/">\r
-    <xsl:element name="config" namespace="urn:ietf:params:xml:ns:netconf:base:1.0">\r
-    <xsl:element name="org-openroadm-device" namespace="http://org/openroadm/device">\r
-    <xsl:element name="info">\r
-      <xsl:apply-templates select="d:data/oor:org-openroadm-device/oor:info"/>\r
-    </xsl:element>\r
-\r
-    <xsl:copy-of select="d:data/oor:org-openroadm-device/oor:users" />\r
-\r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:shelves">\r
-      <xsl:element name="shelves" >\r
-        <xsl:call-template name="shelve-body"/>\r
-      </xsl:element>\r
-    </xsl:for-each>\r
-\r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:circuit-packs">\r
-      <xsl:element name="circuit-packs" >\r
-        <xsl:call-template name="cp-body"/>\r
-      </xsl:element>\r
-    </xsl:for-each>\r
-    \r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:interface">\r
-        <xsl:element name="interface" >\r
-            <xsl:call-template name="inter-body"/>\r
-        </xsl:element>\r
-    </xsl:for-each>\r
-    \r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:protocols">\r
-        <xsl:element name="protocols" >\r
-            <xsl:call-template name="proto-body"/>\r
-        </xsl:element>\r
-    </xsl:for-each>\r
-\r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:degree">\r
-      <xsl:element name="degree" >\r
-        <xsl:call-template name="degree-body"/>\r
-      </xsl:element>\r
-    </xsl:for-each>\r
-\r
-    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:shared-risk-group">\r
-      <xsl:element name="shared-risk-group" >\r
-        <xsl:call-template name="srg-body"/>\r
-      </xsl:element>\r
-    </xsl:for-each>\r
-\r
-    </xsl:element>\r
-    </xsl:element>\r
-  </xsl:template>\r
-  \r
-  <xsl:template match="oor:info">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="name(.) = 'node-id' or name(.) = 'node-number' or name(.) = 'clli' or name(.) = 'ipAddress' or name(.) = 'prefix-length' or name(.) = 'defaultGateway' or name(.) = 'template' or name(.) = 'geoLocation'">\r
-        <xsl:copy-of select="." />\r
-      </xsl:if>\r
-     </xsl:for-each> \r
-  </xsl:template>\r
-\r
-  <xsl:template name="shelve-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="name(.) ='shelf-name' or name(.) = 'shelf-type' or name(.) = 'rack' or name(.) = 'shelf-position' or name(.) = 'administrative-state' or name(.) = 'equipment-state' or name(.) = 'due-date'">\r
-        <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-\r
-  <xsl:template name="cp-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="name(.) = 'circuit-pack-type' or name(.) = 'circuit-pack-product-code' or name(.) = 'circuit-pack-name' or name(.) = 'administrative-state' or name(.) = 'equipment-state' or name(.) = 'circuit-pack-mode' or name(.) = 'shelf' or name(.) = 'slot' or name(.) = 'subSlot' or name(.) = 'due-date' or name(.) = 'parent-circuit-pack'">\r
-        <xsl:copy-of select="." />\r
-      </xsl:if>\r
-      <xsl:if test="name(.) = 'ports'">\r
-        <xsl:for-each select=".">\r
-          <xsl:element name="ports" >\r
-            <xsl:call-template name="ports-body"/>\r
-          </xsl:element>\r
-        </xsl:for-each>\r
-      </xsl:if>\r
-     </xsl:for-each> \r
-  </xsl:template>\r
-\r
-  <xsl:template name="inter-body">\r
-    <xsl:for-each select="./*">\r
-        <xsl:if test="not(name(.) = 'operational-state' or name(.)='ethernet')">\r
-         <xsl:copy-of select="." />\r
-        </xsl:if>\r
-        <xsl:if test="name(.)='ethernet'">\r
-            <xsl:element name="ethernet" >\r
-                <xsl:call-template name="eth-body"/>\r
-            </xsl:element>\r
-        </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-  \r
-   <xsl:template name="eth-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="not(name(.) = 'curr-speed' or name(.)='curr-duplex') ">\r
-         <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-  \r
-  <xsl:template name="proto-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="name(.) = 'lldp'">\r
-        <xsl:for-each select=".">\r
-          <xsl:element name="lldp" >\r
-            <xsl:call-template name="lldp-body"/>\r
-          </xsl:element>\r
-        </xsl:for-each>\r
-      </xsl:if>\r
-     </xsl:for-each> \r
-  </xsl:template>\r
-\r
-  <xsl:template name="ports-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="name(.) = 'port-name' or name(.) = 'port-type' or name(.) = 'port-qual' or name(.) = 'circuit-id' or name(.) = 'administrative-state' or name(.) = 'logical-connection-point' or name(.) = 'otdr-port' ">\r
-         <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-  \r
-  <xsl:template name="lldp-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="not(name(.) = 'nbr-list') ">\r
-         <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-  \r
-  <xsl:template name="degree-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="not(name(.) = 'max-wavelengths')">\r
-         <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-\r
-  <xsl:template name="srg-body">\r
-    <xsl:for-each select="./*">\r
-      <xsl:if test="not(name(.) = 'max-add-drop-ports' or name(.) = 'wavelengthDuplication')">\r
-         <xsl:copy-of select="." />\r
-      </xsl:if>\r
-    </xsl:for-each>\r
-  </xsl:template>\r
-\r
- </xsl:stylesheet>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:d="urn:ietf:params:xml:ns:netconf:base:1.0"
+xmlns:oor="http://org/openroadm/device"
+exclude-result-prefixes="oor d">
+
+  <xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+
+  <xsl:template match="/">
+    <xsl:element name="config" namespace="urn:ietf:params:xml:ns:netconf:base:1.0">
+    <xsl:element name="org-openroadm-device" namespace="http://org/openroadm/device">
+    <xsl:element name="info">
+      <xsl:apply-templates select="d:data/oor:org-openroadm-device/oor:info"/>
+    </xsl:element>
+
+    <xsl:copy-of select="d:data/oor:org-openroadm-device/oor:users" />
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:shelves">
+      <xsl:element name="shelves" >
+        <xsl:call-template name="shelve-body"/>
+      </xsl:element>
+    </xsl:for-each>
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:circuit-packs">
+      <xsl:element name="circuit-packs" >
+        <xsl:call-template name="cp-body"/>
+      </xsl:element>
+    </xsl:for-each>
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:interface">
+        <xsl:element name="interface" >
+            <xsl:call-template name="inter-body"/>
+        </xsl:element>
+    </xsl:for-each>
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:protocols">
+        <xsl:element name="protocols" >
+            <xsl:call-template name="proto-body"/>
+        </xsl:element>
+    </xsl:for-each>
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:degree">
+      <xsl:element name="degree" >
+        <xsl:call-template name="degree-body"/>
+      </xsl:element>
+    </xsl:for-each>
+
+    <xsl:for-each select="d:data/oor:org-openroadm-device/oor:shared-risk-group">
+      <xsl:element name="shared-risk-group" >
+        <xsl:call-template name="srg-body"/>
+      </xsl:element>
+    </xsl:for-each>
+
+    </xsl:element>
+    </xsl:element>
+  </xsl:template>
+
+  <xsl:template match="oor:info">
+    <xsl:for-each select="./*">
+      <xsl:if test="name(.) = 'node-id' or name(.) = 'node-number' or name(.) = 'clli' or name(.) = 'ipAddress' or name(.) = 'prefix-length' or name(.) = 'defaultGateway' or name(.) = 'template' or name(.) = 'geoLocation'">
+        <xsl:copy-of select="." />
+      </xsl:if>
+     </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="shelve-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="name(.) ='shelf-name' or name(.) = 'shelf-type' or name(.) = 'rack' or name(.) = 'shelf-position' or name(.) = 'administrative-state' or name(.) = 'equipment-state' or name(.) = 'due-date'">
+        <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="cp-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="name(.) = 'circuit-pack-type' or name(.) = 'circuit-pack-product-code' or name(.) = 'circuit-pack-name' or name(.) = 'administrative-state' or name(.) = 'equipment-state' or name(.) = 'circuit-pack-mode' or name(.) = 'shelf' or name(.) = 'slot' or name(.) = 'subSlot' or name(.) = 'due-date' or name(.) = 'parent-circuit-pack'">
+        <xsl:copy-of select="." />
+      </xsl:if>
+      <xsl:if test="name(.) = 'ports'">
+        <xsl:for-each select=".">
+          <xsl:element name="ports" >
+            <xsl:call-template name="ports-body"/>
+          </xsl:element>
+        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="inter-body">
+    <xsl:for-each select="./*">
+        <xsl:if test="not(name(.) = 'operational-state' or name(.)='ethernet')">
+         <xsl:copy-of select="." />
+        </xsl:if>
+        <xsl:if test="name(.)='ethernet'">
+            <xsl:element name="ethernet" >
+                <xsl:call-template name="eth-body"/>
+            </xsl:element>
+        </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+   <xsl:template name="eth-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="not(name(.) = 'curr-speed' or name(.)='curr-duplex') ">
+         <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="proto-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="name(.) = 'lldp'">
+        <xsl:for-each select=".">
+          <xsl:element name="lldp" >
+            <xsl:call-template name="lldp-body"/>
+          </xsl:element>
+        </xsl:for-each>
+      </xsl:if>
+     </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="ports-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="name(.) = 'port-name' or name(.) = 'port-type' or name(.) = 'port-qual' or name(.) = 'circuit-id' or name(.) = 'administrative-state' or name(.) = 'logical-connection-point' or name(.) = 'otdr-port' ">
+         <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="lldp-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="not(name(.) = 'nbr-list') ">
+         <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="degree-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="not(name(.) = 'max-wavelengths')">
+         <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+  <xsl:template name="srg-body">
+    <xsl:for-each select="./*">
+      <xsl:if test="not(name(.) = 'max-add-drop-ports' or name(.) = 'wavelengthDuplication')">
+         <xsl:copy-of select="." />
+      </xsl:if>
+    </xsl:for-each>
+  </xsl:template>
+
+ </xsl:stylesheet>

diff --git a/tests/sample_configs/ord_2.1/oper-ROADMA.xml b/tests/sample_configs/ord_2.1/oper-ROADMA.xml
index 728950dd650b5705174615402eb46d30fd86f584..a2938175cd92783c50a7b43841c70bf3ee761873 100644 (file)
--- a/tests/sample_configs/ord_2.1/oper-ROADMA.xml
+++ b/tests/sample_configs/ord_2.1/oper-ROADMA.xml
@@ -113,7 +113,7 @@
         <label>OSC-SLOT</label>
         <provisioned-circuit-pack>2/0/OSC-PLUG</provisioned-circuit-pack>
       </cp-slots>
-         <cp-slots>
+      <cp-slots>
         <slot-name>ETH-PLUG</slot-name>
         <label>ETH-PLUG</label>
         <provisioned-circuit-pack>2/0/ETH-PLUG</provisioned-circuit-pack>
@@ -283,7 +283,7 @@
         <operational-state>inService</operational-state>
       </ports>
     </circuit-packs>
-       <circuit-packs>
+    <circuit-packs>
       <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
       <circuit-pack-type>port</circuit-pack-type>
       <administrative-state>inService</administrative-state>
@@ -297,7 +297,7 @@
       <shelf>2</shelf>
       <slot>0</slot>
       <subSlot>0</subSlot>
-         <parent-circuit-pack>
+      <parent-circuit-pack>
         <circuit-pack-name>2/0</circuit-pack-name>
         <cp-slot-name>ETH-PLUG</cp-slot-name>
       </parent-circuit-pack>
@@ -330,7 +330,7 @@
         <label>OSC-SLOT</label>
         <provisioned-circuit-pack>3/0/OSC-PLUG</provisioned-circuit-pack>
       </cp-slots>
-         <cp-slots>
+      <cp-slots>
         <slot-name>ETH-PLUG</slot-name>
         <label>ETH-PLUG</label>
         <provisioned-circuit-pack>3/0/ETH-PLUG</provisioned-circuit-pack>
@@ -500,7 +500,7 @@
         <operational-state>inService</operational-state>
       </ports>
     </circuit-packs>
-       <circuit-packs>
+    <circuit-packs>
       <circuit-pack-name>3/0/ETH-PLUG</circuit-pack-name>
       <circuit-pack-type>port</circuit-pack-type>
       <administrative-state>inService</administrative-state>
@@ -514,7 +514,7 @@
       <shelf>3</shelf>
       <slot>0</slot>
       <subSlot>0</subSlot>
-         <parent-circuit-pack>
+      <parent-circuit-pack>
         <circuit-pack-name>3/0</circuit-pack-name>
         <cp-slot-name>ETH-PLUG</cp-slot-name>
       </parent-circuit-pack>
@@ -883,7 +883,7 @@
         <span-loss-transmit>10.0</span-loss-transmit>
       </ots>
     </interface>
-       <interface>
+    <interface>
       <name>eth-2/0/ETH-PLUG</name>
       <type xmlns:openROADM-if="http://org/openroadm/interfaces">openROADM-if:ethernetCsmacd</type>
       <administrative-state>inService</administrative-state>
@@ -915,7 +915,7 @@
         <curr-duplex>FULL</curr-duplex>
       </ethernet>
     </interface>
-       <protocols>
+    <protocols>
       <lldp xmlns="http://org/openroadm/lldp">
         <global-config>
           <adminStatus>enable</adminStatus>
@@ -926,7 +926,7 @@
           <ifName>eth-2/0/ETH-PLUG</ifName>
           <adminStatus>txandrx</adminStatus>
         </port-config>
-               <port-config>
+        <port-config>
           <ifName>eth-3/0/ETH-PLUG</ifName>
           <adminStatus>txandrx</adminStatus>
         </port-config>
@@ -3313,11 +3313,11 @@
         <index>1</index>
         <circuit-pack-name>2/0</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>2</index>
         <circuit-pack-name>2/0/OSC-PLUG</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>3</index>
         <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
       </circuit-packs>
@@ -3334,11 +3334,11 @@
         <index>1</index>
         <circuit-pack-name>3/0</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>2</index>
         <circuit-pack-name>3/0/OSC-PLUG</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>3</index>
         <circuit-pack-name>3/0/ETH-PLUG</circuit-pack-name>
       </circuit-packs>

diff --git a/tests/sample_configs/ord_2.1/oper-ROADMC.xml b/tests/sample_configs/ord_2.1/oper-ROADMC.xml
index d2dff6407c030b3fac865ae110a7974c60af975b..4e9e0bf5d9f256a025ce51b5d49164371e67b69c 100644 (file)
--- a/tests/sample_configs/ord_2.1/oper-ROADMC.xml
+++ b/tests/sample_configs/ord_2.1/oper-ROADMC.xml
@@ -113,7 +113,7 @@
         <label>OSC-SLOT</label>
         <provisioned-circuit-pack>2/0/OSC-PLUG</provisioned-circuit-pack>
       </cp-slots>
-         <cp-slots>
+      <cp-slots>
         <slot-name>ETH-PLUG</slot-name>
         <label>ETH-PLUG</label>
         <provisioned-circuit-pack>2/0/ETH-PLUG</provisioned-circuit-pack>
@@ -283,7 +283,7 @@
         <operational-state>inService</operational-state>
       </ports>
     </circuit-packs>
-       <circuit-packs>
+    <circuit-packs>
       <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
       <circuit-pack-type>port</circuit-pack-type>
       <administrative-state>inService</administrative-state>
@@ -297,7 +297,7 @@
       <shelf>2</shelf>
       <slot>0</slot>
       <subSlot>0</subSlot>
-         <parent-circuit-pack>
+      <parent-circuit-pack>
         <circuit-pack-name>2/0</circuit-pack-name>
         <cp-slot-name>ETH-PLUG</cp-slot-name>
       </parent-circuit-pack>
@@ -310,7 +310,7 @@
         <administrative-state>inService</administrative-state>
         <operational-state>inService</operational-state>
       </ports>
-       </circuit-packs>
+    </circuit-packs>
     <circuit-packs>
       <circuit-pack-name>3/0</circuit-pack-name>
       <circuit-pack-type>WSSDEG</circuit-pack-type>
@@ -330,7 +330,7 @@
         <label>OSC-SLOT</label>
         <provisioned-circuit-pack>3/0/OSC-PLUG</provisioned-circuit-pack>
       </cp-slots>
-         <cp-slots>
+      <cp-slots>
         <slot-name>ETH-PLUG</slot-name>
         <label>ETH-PLUG</label>
         <provisioned-circuit-pack>3/0/ETH-PLUG</provisioned-circuit-pack>
@@ -500,7 +500,7 @@
         <operational-state>inService</operational-state>
       </ports>
     </circuit-packs>
-       <circuit-packs>
+    <circuit-packs>
       <circuit-pack-name>3/0/ETH-PLUG</circuit-pack-name>
       <circuit-pack-type>port</circuit-pack-type>
       <administrative-state>inService</administrative-state>
@@ -514,7 +514,7 @@
       <shelf>3</shelf>
       <slot>0</slot>
       <subSlot>0</subSlot>
-         <parent-circuit-pack>
+      <parent-circuit-pack>
         <circuit-pack-name>3/0</circuit-pack-name>
         <cp-slot-name>ETH-PLUG</cp-slot-name>
       </parent-circuit-pack>
@@ -883,7 +883,7 @@
         <span-loss-transmit>15.0</span-loss-transmit>
       </ots>
     </interface>
-       <interface>
+    <interface>
       <name>eth-2/0/ETH-PLUG</name>
       <type xmlns:openROADM-if="http://org/openroadm/interfaces">openROADM-if:ethernetCsmacd</type>
       <administrative-state>inService</administrative-state>
@@ -915,7 +915,7 @@
         <curr-duplex>FULL</curr-duplex>
       </ethernet>
     </interface>
-       <protocols>
+    <protocols>
       <lldp xmlns="http://org/openroadm/lldp">
         <global-config>
           <adminStatus>enable</adminStatus>
@@ -926,7 +926,7 @@
           <ifName>eth-2/0/ETH-PLUG</ifName>
           <adminStatus>txandrx</adminStatus>
         </port-config>
-               <port-config>
+        <port-config>
           <ifName>eth-3/0/ETH-PLUG</ifName>
           <adminStatus>txandrx</adminStatus>
         </port-config>
@@ -3313,11 +3313,11 @@
         <index>1</index>
         <circuit-pack-name>2/0</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>2</index>
         <circuit-pack-name>2/0/OSC-PLUG</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>3</index>
         <circuit-pack-name>2/0/ETH-PLUG</circuit-pack-name>
       </circuit-packs>
@@ -3334,11 +3334,11 @@
         <index>1</index>
         <circuit-pack-name>3/0</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>2</index>
         <circuit-pack-name>3/0/OSC-PLUG</circuit-pack-name>
       </circuit-packs>
-         <circuit-packs>
+      <circuit-packs>
         <index>3</index>
         <circuit-pack-name>3/0/ETH-PLUG</circuit-pack-name>
       </circuit-packs>

diff --git a/tests/stubrenderer/src/main/resources/org/opendaylight/blueprint/stubrenderer-blueprint.xml b/tests/stubrenderer/src/main/resources/org/opendaylight/blueprint/stubrenderer-blueprint.xml
index dff4691687660826dee660d63eacc14ff98c2614..e7a811d56f53e6e83c2fb6adbaf89209bc137f5c 100644 (file)
--- a/tests/stubrenderer/src/main/resources/org/opendaylight/blueprint/stubrenderer-blueprint.xml
+++ b/tests/stubrenderer/src/main/resources/org/opendaylight/blueprint/stubrenderer-blueprint.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!-- vi: set et smarttab sw=4 tabstop=4: -->\r
-<!--\r
-Copyright © 2017 Orange and others. All rights reserved.\r
-\r
-This program and the accompanying materials are made available under the\r
-terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
-and is available at http://www.eclipse.org/legal/epl-v10.html\r
-\r
-Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange\r
--->\r
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"\r
-  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"\r
-  odl:use-default-for-reference-types="true">\r
-\r
-  <reference id="rpcRegistry"\r
-       interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>\r
-\r
-  <reference id="notificationPublishService"\r
-          interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"\r
-          odl:type="default" />\r
-\r
-   <reference id="notificationService"\r
-          interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"\r
-          odl:type="default" />\r
-\r
-  <bean id="provider"\r
-    class="org.opendaylight.transportpce.stubrenderer.impl.StubrendererProvider"\r
-    init-method="init" destroy-method="close">\r
-    <argument ref="rpcRegistry" />\r
-    <argument ref="notificationPublishService" />\r
-    <argument ref="notificationService"/>\r
-  </bean>\r
-\r
-</blueprint>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+Copyright © 2017 Orange 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
+
+Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+  xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+  odl:use-default-for-reference-types="true">
+
+  <reference id="rpcRegistry"
+        interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/>
+
+  <reference id="notificationPublishService"
+          interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+          odl:type="default" />
+
+   <reference id="notificationService"
+          interface="org.opendaylight.controller.md.sal.binding.api.NotificationService"
+          odl:type="default" />
+
+  <bean id="provider"
+    class="org.opendaylight.transportpce.stubrenderer.impl.StubrendererProvider"
+    init-method="init" destroy-method="close">
+    <argument ref="rpcRegistry" />
+    <argument ref="notificationPublishService" />
+    <argument ref="notificationService"/>
+  </bean>
+
+</blueprint>