Driver fixes, Device device discovery in Sanity, two case additions to Perf
diff --git a/TestON/tests/CassandraCheck/CassandraCheck.topo b/TestON/tests/CassandraCheck/CassandraCheck.topo
index 41e5854..db65096 100644
--- a/TestON/tests/CassandraCheck/CassandraCheck.topo
+++ b/TestON/tests/CassandraCheck/CassandraCheck.topo
@@ -4,56 +4,56 @@
<ONOS1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS4>
<ONOS5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS5>
<ONOS6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS6>
<ONOS7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
</ONOS7>
<ONOS8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
</ONOS8>
@@ -62,7 +62,7 @@
<Zookeeper1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -72,7 +72,7 @@
<Cassandra1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -82,49 +82,49 @@
<Mininet2>
<host>10.128.6.2</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet2>
<Mininet3>
<host>10.128.6.3</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet3>
<Mininet4>
<host>10.128.6.4</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet4>
<Mininet5>
<host>10.128.6.5</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet5>
<Mininet6>
<host>10.128.6.6</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet6>
<Mininet7>
<host>10.128.6.7</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet7>
<Mininet8>
<host>10.128.6.8</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet8>
diff --git a/TestON/tests/HPSwitchTest/HPSwitchTest.topo b/TestON/tests/HPSwitchTest/HPSwitchTest.topo
index 5576839..c6ad886 100644
--- a/TestON/tests/HPSwitchTest/HPSwitchTest.topo
+++ b/TestON/tests/HPSwitchTest/HPSwitchTest.topo
@@ -5,7 +5,7 @@
<host>24.6.49.222</host>
<user> Paxterra </user>
<port> 6500 </port>
- <password>0nLab_gu3st</password>
+ <password></password>
<type>RemoteSysDriver</type>
<COMPONENTS>
</COMPONENTS>
diff --git a/TestON/tests/MininetTest/MininetTest.topo b/TestON/tests/MininetTest/MininetTest.topo
index 1515f57..46608e1 100644
--- a/TestON/tests/MininetTest/MininetTest.topo
+++ b/TestON/tests/MininetTest/MininetTest.topo
@@ -66,9 +66,15 @@
<connect_order>9</connect_order>
</ONOS4>
<Mininet1>
+<<<<<<< HEAD
<host>10.128.100.11</host>
<user>admin</user>
<password>onos_test</password>
+=======
+ <host>10.128.100.15</host>
+ <user>user_one</user>
+ <password></password>
+>>>>>>> 229277f2a177afe10c76af83686b38645fe2abe3
<type>MininetCliDriver</type>
<COMPONENTS>
# Specify the Option for mininet
diff --git a/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.topo b/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.topo
index 48fc2a7..0c77a3b 100644
--- a/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.topo
+++ b/TestON/tests/OnosCHO4nodes/OnosCHO4nodes.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Zookeeper2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<Zookeeper3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -34,7 +34,7 @@
<Zookeeper4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -44,7 +44,7 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
@@ -54,7 +54,7 @@
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
@@ -64,7 +64,7 @@
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
@@ -74,7 +74,7 @@
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
@@ -84,7 +84,7 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS>
@@ -94,7 +94,7 @@
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -104,7 +104,7 @@
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
<COMPONENTS>
@@ -114,7 +114,7 @@
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>12</connect_order>
<COMPONENTS>
@@ -124,7 +124,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>13</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.topo b/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.topo
index f9c4696..d74a523 100644
--- a/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.topo
+++ b/TestON/tests/OnosCHO8nodes/OnosCHO8nodes.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Zookeeper2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<Zookeeper3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -34,7 +34,7 @@
<Zookeeper4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -44,7 +44,7 @@
<Zookeeper5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
@@ -54,7 +54,7 @@
<Zookeeper6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
@@ -64,7 +64,7 @@
<Zookeeper7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
@@ -74,7 +74,7 @@
<Zookeeper8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
@@ -84,7 +84,7 @@
<Cassandra1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS>
@@ -94,7 +94,7 @@
<Cassandra2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -104,7 +104,7 @@
<Cassandra3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>11</connect_order>
<COMPONENTS>
@@ -114,7 +114,7 @@
<Cassandra4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>12</connect_order>
<COMPONENTS>
@@ -124,7 +124,7 @@
<Cassandra5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>13</connect_order>
<COMPONENTS>
@@ -134,7 +134,7 @@
<Cassandra6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>14</connect_order>
<COMPONENTS>
@@ -144,7 +144,7 @@
<Cassandra7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>15</connect_order>
<COMPONENTS>
@@ -154,7 +154,7 @@
<Cassandra8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>16</connect_order>
<COMPONENTS>
@@ -164,7 +164,7 @@
<ONOS1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>17</connect_order>
<COMPONENTS>
@@ -174,7 +174,7 @@
<ONOS2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>18</connect_order>
<COMPONENTS>
@@ -184,7 +184,7 @@
<ONOS3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>19</connect_order>
<COMPONENTS>
@@ -194,7 +194,7 @@
<ONOS4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>20</connect_order>
<COMPONENTS>
@@ -204,7 +204,7 @@
<ONOS5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>21</connect_order>
<COMPONENTS>
@@ -214,7 +214,7 @@
<ONOS6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>22</connect_order>
<COMPONENTS>
@@ -224,7 +224,7 @@
<ONOS7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>23</connect_order>
<COMPONENTS>
@@ -234,7 +234,7 @@
<ONOS8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>24</connect_order>
<COMPONENTS>
@@ -244,7 +244,7 @@
<Mininet1>
<host>10.128.6.2</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>25</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo b/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo
index 48fc2a7..0c77a3b 100644
--- a/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo
+++ b/TestON/tests/OnosDD_PARP/OnosDD_PARP.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Zookeeper2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<Zookeeper3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -34,7 +34,7 @@
<Zookeeper4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -44,7 +44,7 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
@@ -54,7 +54,7 @@
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
@@ -64,7 +64,7 @@
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
@@ -74,7 +74,7 @@
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
@@ -84,7 +84,7 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS>
@@ -94,7 +94,7 @@
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -104,7 +104,7 @@
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
<COMPONENTS>
@@ -114,7 +114,7 @@
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>12</connect_order>
<COMPONENTS>
@@ -124,7 +124,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>13</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosPerf/OnosPerf.topo b/TestON/tests/OnosPerf/OnosPerf.topo
index 8e49fa3..f62e07a 100644
--- a/TestON/tests/OnosPerf/OnosPerf.topo
+++ b/TestON/tests/OnosPerf/OnosPerf.topo
@@ -3,7 +3,7 @@
<Zookeeper1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -13,7 +13,7 @@
<Cassandra1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -23,56 +23,56 @@
<ONOS1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS4>
<ONOS5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS5>
<ONOS6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS6>
<ONOS7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
</ONOS7>
<ONOS8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
</ONOS8>
@@ -81,49 +81,49 @@
<Mininet2>
<host>10.128.6.2</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet2>
<Mininet3>
<host>10.128.6.3</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>5</connect_order>
</Mininet3>
<Mininet4>
<host>10.128.6.4</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>6</connect_order>
</Mininet4>
<Mininet5>
<host>10.128.6.5</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>7</connect_order>
</Mininet5>
<Mininet6>
<host>10.128.6.6</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>8</connect_order>
</Mininet6>
<Mininet7>
<host>10.128.6.7</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>9</connect_order>
</Mininet7>
<Mininet8>
<host>10.128.6.8</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>10</connect_order>
</Mininet8>
diff --git a/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.topo b/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.topo
index eb6130f..d7bf736 100644
--- a/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.topo
+++ b/TestON/tests/OnosPerf4nodes/OnosPerf4nodes.topo
@@ -3,7 +3,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
</Zookeeper1>
@@ -11,28 +11,28 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>2</connect_order>
</Cassandra1>
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>3</connect_order>
</Cassandra2>
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>4</connect_order>
</Cassandra3>
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
</Cassandra4>
@@ -40,28 +40,28 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS4>
@@ -69,7 +69,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -83,14 +83,14 @@
<Mininet4>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>11</connect_order>
</Mininet4>
<Mininet8>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>12</connect_order>
</Mininet8>
diff --git a/TestON/tests/OnosSanity/OnosSanity.topo b/TestON/tests/OnosSanity/OnosSanity.topo
index f55162c..1ee0ac3 100644
--- a/TestON/tests/OnosSanity/OnosSanity.topo
+++ b/TestON/tests/OnosSanity/OnosSanity.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.4.26</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Cassandra1>
<host>10.128.4.26</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<ONOS1>
<host>10.128.4.26</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -35,7 +35,7 @@
<Mininet1>
<host>10.128.4.26</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
index 48fc2a7..0c77a3b 100644
--- a/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
+++ b/TestON/tests/OnosSanity4nodes/OnosSanity4nodes.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Zookeeper2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<Zookeeper3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -34,7 +34,7 @@
<Zookeeper4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -44,7 +44,7 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
@@ -54,7 +54,7 @@
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
@@ -64,7 +64,7 @@
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
@@ -74,7 +74,7 @@
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
@@ -84,7 +84,7 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS>
@@ -94,7 +94,7 @@
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -104,7 +104,7 @@
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
<COMPONENTS>
@@ -114,7 +114,7 @@
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>12</connect_order>
<COMPONENTS>
@@ -124,7 +124,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>13</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.topo b/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.topo
index 6fd87d8..912464b 100644
--- a/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.topo
+++ b/TestON/tests/OnosSanity8nodes/OnosSanity8nodes.topo
@@ -4,7 +4,7 @@
<Zookeeper1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
@@ -14,7 +14,7 @@
<Zookeeper2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -24,7 +24,7 @@
<Zookeeper3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -34,7 +34,7 @@
<Zookeeper4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -44,7 +44,7 @@
<Zookeeper5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS>
@@ -54,7 +54,7 @@
<Zookeeper6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS>
@@ -64,7 +64,7 @@
<Zookeeper7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS>
@@ -74,7 +74,7 @@
<Zookeeper8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS>
@@ -84,7 +84,7 @@
<Cassandra1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS>
@@ -94,7 +94,7 @@
<Cassandra2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>10</connect_order>
<COMPONENTS>
@@ -104,7 +104,7 @@
<Cassandra3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>11</connect_order>
<COMPONENTS>
@@ -114,7 +114,7 @@
<Cassandra4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>12</connect_order>
<COMPONENTS>
@@ -124,7 +124,7 @@
<Cassandra5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>13</connect_order>
<COMPONENTS>
@@ -134,7 +134,7 @@
<Cassandra6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>14</connect_order>
<COMPONENTS>
@@ -144,7 +144,7 @@
<Cassandra7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>15</connect_order>
<COMPONENTS>
@@ -154,7 +154,7 @@
<Cassandra8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>16</connect_order>
<COMPONENTS>
@@ -164,7 +164,7 @@
<ONOS1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>17</connect_order>
<COMPONENTS>
@@ -174,7 +174,7 @@
<ONOS2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>18</connect_order>
<COMPONENTS>
@@ -184,7 +184,7 @@
<ONOS3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>19</connect_order>
<COMPONENTS>
@@ -194,7 +194,7 @@
<ONOS4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>20</connect_order>
<COMPONENTS>
@@ -204,7 +204,7 @@
<ONOS5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>21</connect_order>
<COMPONENTS>
@@ -214,7 +214,7 @@
<ONOS6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>22</connect_order>
<COMPONENTS>
@@ -224,7 +224,7 @@
<ONOS7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>23</connect_order>
<COMPONENTS>
@@ -234,7 +234,7 @@
<ONOS8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>24</connect_order>
<COMPONENTS>
@@ -244,7 +244,7 @@
<Mininet1>
<host>10.128.7.7</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>25</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/OnosScale/OnosScale.topo b/TestON/tests/OnosScale/OnosScale.topo
index 41e5854..db65096 100644
--- a/TestON/tests/OnosScale/OnosScale.topo
+++ b/TestON/tests/OnosScale/OnosScale.topo
@@ -4,56 +4,56 @@
<ONOS1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.4.12</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.4.13</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.4.14</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS4>
<ONOS5>
<host>10.128.4.15</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS5>
<ONOS6>
<host>10.128.4.16</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS6>
<ONOS7>
<host>10.128.4.17</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
</ONOS7>
<ONOS8>
<host>10.128.4.18</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>11</connect_order>
</ONOS8>
@@ -62,7 +62,7 @@
<Zookeeper1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -72,7 +72,7 @@
<Cassandra1>
<host>10.128.4.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS>
@@ -82,49 +82,49 @@
<Mininet2>
<host>10.128.6.2</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet2>
<Mininet3>
<host>10.128.6.3</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet3>
<Mininet4>
<host>10.128.6.4</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet4>
<Mininet5>
<host>10.128.6.5</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet5>
<Mininet6>
<host>10.128.6.6</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet6>
<Mininet7>
<host>10.128.6.7</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet7>
<Mininet8>
<host>10.128.6.8</host>
<user>miniuser</user>
- <password>onos_test</password>
+ <password></password>
<type>RemoteMininetDriver</type>
<connect_order>4</connect_order>
</Mininet8>
diff --git a/TestON/tests/OnosScale4nodes/OnosScale4nodes.topo b/TestON/tests/OnosScale4nodes/OnosScale4nodes.topo
index e9d764f..de46745 100644
--- a/TestON/tests/OnosScale4nodes/OnosScale4nodes.topo
+++ b/TestON/tests/OnosScale4nodes/OnosScale4nodes.topo
@@ -4,28 +4,28 @@
<ONOS1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>9</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>OnosCliDriver</type>
<connect_order>10</connect_order>
</ONOS4>
@@ -33,7 +33,7 @@
<Zookeeper1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>ZookeeperCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS>
@@ -43,28 +43,28 @@
<Cassandra1>
<host>10.128.100.1</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>3</connect_order>
</Cassandra1>
<Cassandra2>
<host>10.128.100.4</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>4</connect_order>
</Cassandra2>
<Cassandra3>
<host>10.128.100.5</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>5</connect_order>
</Cassandra3>
<Cassandra4>
<host>10.128.100.6</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>CassandraCliDriver</type>
<connect_order>6</connect_order>
</Cassandra4>
@@ -72,7 +72,7 @@
<Mininet1>
<host>10.128.100.11</host>
<user>admin</user>
- <password>onos_test</password>
+ <password></password>
<type>MininetCliDriver</type>
<connect_order>25</connect_order>
<COMPONENTS>
diff --git a/TestON/tests/TimsDeathTest/TimsDeathTest.topo b/TestON/tests/TimsDeathTest/TimsDeathTest.topo
index 95b6220..351e98e 100644
--- a/TestON/tests/TimsDeathTest/TimsDeathTest.topo
+++ b/TestON/tests/TimsDeathTest/TimsDeathTest.topo
@@ -1,87 +1,17 @@
<TOPOLOGY>
<COMPONENT>
-
- <ONOS1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>7</connect_order>
- </ONOS1>
- <ONOS2>
- <host>10.128.100.4</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>8</connect_order>
- </ONOS2>
- <ONOS3>
- <host>10.128.100.5</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>9</connect_order>
- </ONOS3>
- <ONOS4>
- <host>10.128.100.6</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>OnosCliDriver</type>
- <connect_order>10</connect_order>
- </ONOS4>
-
- <Zookeeper1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>ZookeeperCliDriver</type>
- <connect_order>2</connect_order>
- <COMPONENTS>
- </COMPONENTS>
- </Zookeeper1>
-
- <Cassandra1>
- <host>10.128.100.1</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>CassandraCliDriver</type>
- <connect_order>3</connect_order>
- </Cassandra1>
- <Cassandra2>
- <host>10.128.100.4</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>CassandraCliDriver</type>
- <connect_order>4</connect_order>
- </Cassandra2>
- <Cassandra3>
- <host>10.128.100.5</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>CassandraCliDriver</type>
- <connect_order>5</connect_order>
- </Cassandra3>
- <Cassandra4>
- <host>10.128.100.6</host>
- <user>admin</user>
- <password>onos_test</password>
- <type>CassandraCliDriver</type>
- <connect_order>6</connect_order>
- </Cassandra4>
-
<Mininet1>
- <host>10.128.100.11</host>
- <user>admin</user>
- <password>onos_test</password>
+ <host>10.128.100.15</host>
+ <user>user_one</user>
+ <password>user_one</password>
<type>MininetCliDriver</type>
<connect_order>25</connect_order>
<COMPONENTS>
# Specify the Option for mininet
<arg1> --custom ~/mininet/custom/TimsDeathTopo.py </arg1>
<arg2> --topo timtopo </arg2>
- <controller> remote,ip=10.128.100.1,port=6633 </controller>
+ <controller> none </controller>
</COMPONENTS>
</Mininet1>
-
</COMPONENT>
</TOPOLOGY>