CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Devdeep Singh · Vijayendra Bhamidipati · commit 0e293b7b5b26 · 2012-05-25T17:18:11.000-07:00
Description:

	Made changes to persist the vsm configuration
	after updating it.
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/NetconfHelper.java
@@ -126,7 +126,7 @@ private String receive() {
             while (true) {
                 if (inputStream.available() == 0) {
                     int conditions = _session.waitForCondition(ChannelCondition.STDOUT_DATA
-                            | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 500);
+                            | ChannelCondition.STDERR_DATA | ChannelCondition.EOF, 2000);
 
                     if ((conditions & ChannelCondition.TIMEOUT) != 0) {
                         break;
diff --git a/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java b/utils/src/com/cloud/utils/cisco/n1kv/vsm/VsmCommand.java
@@ -259,7 +259,7 @@ private static Element configPortProfileDetails(Document doc, String name, PortP
         portProf.appendChild(state);
 
         // Persist the configuration across reboots.
-        // modeConfigure.appendChild(persistConfiguration(doc));
+        modeConfigure.appendChild(persistConfiguration(doc));
 
         return configure;
     }
@@ -301,7 +301,7 @@ private static Element configPortProfileDetails(Document doc, String name, Switc
         }
 
         // Persist the configuration across reboots.
-        // modeConfigure.appendChild(persistConfiguration(doc));
+        modeConfigure.appendChild(persistConfiguration(doc));
 
         return configure;
     }
@@ -328,7 +328,7 @@ private static Element deletePortProfileDetails(Document doc, String name) {
         portDetails.appendChild(value);
 
         // Persist the configuration across reboots.
-        // modeConfigure.appendChild(persistConfiguration(doc));
+        modeConfigure.appendChild(persistConfiguration(doc));
 
         return configure;
     }

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ private static Element configPortProfileDetails(Document doc, String name, PortP`
`259`	`259`	`portProf.appendChild(state);`
`260`	`260`
`261`	`261`	`// Persist the configuration across reboots.`
`262`		`- // modeConfigure.appendChild(persistConfiguration(doc));`
	`262`	`+ modeConfigure.appendChild(persistConfiguration(doc));`
`263`	`263`
`264`	`264`	`return configure;`
`265`	`265`	`}`
`@@ -301,7 +301,7 @@ private static Element configPortProfileDetails(Document doc, String name, Switc`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`// Persist the configuration across reboots.`
`304`		`- // modeConfigure.appendChild(persistConfiguration(doc));`
	`304`	`+ modeConfigure.appendChild(persistConfiguration(doc));`
`305`	`305`
`306`	`306`	`return configure;`
`307`	`307`	`}`
`@@ -328,7 +328,7 @@ private static Element deletePortProfileDetails(Document doc, String name) {`
`328`	`328`	`portDetails.appendChild(value);`
`329`	`329`
`330`	`330`	`// Persist the configuration across reboots.`
`331`		`- // modeConfigure.appendChild(persistConfiguration(doc));`
	`331`	`+ modeConfigure.appendChild(persistConfiguration(doc));`
`332`	`332`
`333`	`333`	`return configure;`
`334`	`334`	`}`