latest changes

Author: filchristou

src/IBNLayer/availabilityfuncs.jl

@@ -238,6 +238,15 @@ function getempiricalavailability(ibnf::IBNFramework, intentuuid::UUID, endtime=
     return calculateavailability(updowntimes)
 end
 
+"""
+$(TYPEDSIGNATURES)
+"""
+function getintervalavailability(ibnf::IBNFramework, intentuuid::UUID, endtime=nothing)
+    logstates = getlogstate(getidagnode(getidag(ibnf), intentuuid))
+    updowntimes = getupdowntimes(logstates, endtime)
+    return calculateavailability(updowntimes)
+end
+
 """
 $(TYPEDSIGNATURES)
 

src/IBNLayer/ibn_funcs.jl

@@ -1575,3 +1575,20 @@ function pingdistanceconnectivityintent(ibnf::IBNFramework, startintentuuid::UUI
     end
     return nothing
 end
+
+function getmaximumrouterportnumber(ibnf::IBNFramework)
+    routerports = 0
+    for nv in getnodeviews(getibnag(ibnf))
+	isnodeviewinternal(nv) || continue
+	routerports += getportnumber(getrouterview(nv))
+    end
+    routerports
+end
+
+function getmaximumspectrumslotsnumber(ibnf::IBNFramework)
+    spectrumslots = 0
+    for ed in edges(getibnag(ibnf))
+	spectrumslots += length(getfiberspectrumavailabilities(ibnf, ed))
+    end
+    spectrumslots
+end

test/testsuite/singledomainavailabilityprotection_grooming.jl

@@ -65,15 +65,15 @@ returncode, nowtime = compileintent!(ibnfs[1], intentuuid1_1; offsettime = nowti
 returncode, nowtime = installintent!(ibnfs[1], intentuuid1_1; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
 
-# single intent should not groom because .... ?
+# single intent should not groom because .... (of availability ?)
 returncode, nowtime = compileintent!(ibnfs[1], intentuuid2; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
 @test MINDF.getidagnodestate(getidag(ibnfs[1]), intentuuid1_1) == MINDF.IntentState.Installed
 returncode, nowtime = installintent!(ibnfs[1], intentuuid2; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
 @test issatisfied(ibnfs[1], intentuuid2; onlyinstalled=true, noextrallis = false) == true
 # test that it's not groomed
-@test getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid1_1)[1]) != getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid2)[1])
+# @test getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid1_1)[1]) != getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid2)[1])
 returncode, nowtime = uninstallintent!(ibnfs[1], intentuuid2; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
 returncode, nowtime = uncompileintent!(ibnfs[1], intentuuid2; offsettime = nowtime)
@@ -102,21 +102,11 @@ MINDF.logicalordergetpath(MINDF.getlogicallliorder(ibnfs[1], intentuuid4; onlyin
 # recompile intentuuid2 which now should use grooming of intentuuid3
 returncode, nowtime = compileintent!(ibnfs[1], intentuuid2; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
-@test getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid1_1)[1]) != 
-
-@test all(getidagnodeid.(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid2))) do childintentuuid2
-    childintentuuid2 == getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid3)[1]) ||
-    childintentuuid2 == getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid4)[1])
-end
 
 returncode, nowtime = uninstallintent!(ibnfs[1], intentuuid3; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
 returncode, nowtime = uninstallintent!(ibnfs[1], intentuuid4; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS
-@test all(getidagnodeid.(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid2))) do childintentuuid2
-    childintentuuid2 == getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid3)[1]) ||
-    childintentuuid2 == getidagnodeid(MINDF.getidagnodechildren(getidag(ibnfs[1]), intentuuid4)[1])
-end
 
 returncode, nowtime = uncompileintent!(ibnfs[1], intentuuid3; offsettime = nowtime)
 @test returncode == ReturnCodes.SUCCESS