Fixes for fabric configuration in jenkins file
Change-Id: I6573fa29626705d5431f9d642565ddee06f2d19a
(cherry picked from commit 22e48860a6e4f2e8f8614bc5a9d61cd0cf883ee4)
diff --git a/Jenkinsfile.newBuildSystem b/Jenkinsfile.newBuildSystem
index 63c1fe9..984eb46 100644
--- a/Jenkinsfile.newBuildSystem
+++ b/Jenkinsfile.newBuildSystem
@@ -257,10 +257,7 @@
// Delete old ONOS netcfg
runHeadNodeCmd("http -a onos:rocks DELETE http://onos-fabric:8181/onos/v1/network/configuration/")
// Load new configuration
- runHeadNodeCmd("""
- cd /opt/cord_profile
- docker-compose -p ${pod_config.cord_profile} exec -T xos_ui python /opt/xos/tosca/run.py xosadmin@opencord.org /opt/cord_profile/fabric-service.yaml
- """)
+ runHeadNodeCmd("http -a onos:rocks POST http://onos-fabric:8181/onos/v1/network/configuration/ < /opt/cord_profile/fabric-network-cfg.json")
// Restart ONOS apps
runHeadNodeCmd("""
http -a onos:rocks DELETE http://onos-fabric:8181/onos/v1/applications/org.onosproject.segmentrouting/active; sleep 5
@@ -419,8 +416,12 @@
if ("${switchMac}" != "") {
switchMac = switchMac.toLowerCase().replaceAll(':','')
// Get fabric IPs of compute nodes connected to the switch
- computeFabricIps = runHeadNodeCmd("sshpass -p rocks ssh -q -oStrictHostKeyChecking=no -l onos -p 8101 onos-fabric hosts -j | jq '.[] | select(.location.elementId | contains(\\\"${switchMac}\\\")) | .ipAddresses' | grep -o '\\\"${fabricIpPrefix}.[1-9][0-9]*.[0-9]*\\\"'",
- "-q").trim()
+ try {
+ computeFabricIps = runHeadNodeCmd("sshpass -p rocks ssh -q -oStrictHostKeyChecking=no -l onos -p 8101 onos-fabric hosts -j | jq '.[] | select(.location.elementId | contains(\\\"${switchMac}\\\")) | .ipAddresses' | grep -o '\\\"${fabricIpPrefix}.[1-9][0-9]*.[0-9]*\\\"'",
+ "-q").trim()
+ }catch (exception) {
+ return computeNames
+ }
computeFabricIps = "${computeFabricIps}".split()
computeFabricIps = new JsonSlurperClassic().parseText("${computeFabricIps}")
// Figure out which compute node connects to the switch