Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
1d6a2d8d
Commit
1d6a2d8d
authored
Dec 25, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
f7c6b0ff
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
15 deletions
+47
-15
software/ors-amarisoft/k/krequest-cb5.enb+
software/ors-amarisoft/k/krequest-cb5.enb+
+32
-1
software/ors-amarisoft/k/krequest-ors.enb.old
software/ors-amarisoft/k/krequest-ors.enb.old
+6
-6
software/ors-amarisoft/k/kslap.py
software/ors-amarisoft/k/kslap.py
+9
-8
No files found.
software/ors-amarisoft/k/krequest-cb5.enb+
View file @
1d6a2d8d
...
@@ -48,7 +48,7 @@ def eref(ref):
...
@@ -48,7 +48,7 @@ def eref(ref):
# iENB is shorthand to request shared instance on ienb.
# iENB is shorthand to request shared instance on ienb.
def iENB(ref, kw):
def iENB(ref, kw):
return kslap.i
ENB
(ienb, ref, kw)
return kslap.i
SHARED
(ienb, ref, kw)
# Radio Units
# Radio Units
...
@@ -118,3 +118,34 @@ if 0: # to test 5G
...
@@ -118,3 +118,34 @@ if 0: # to test 5G
icell1 = iENB(eref('CELL1'), CELL1)
icell1 = iENB(eref('CELL1'), CELL1)
icell2 = iENB(eref('CELL2'), CELL2)
icell2 = iENB(eref('CELL2'), CELL2)
# --------
# UEsim
iuesim = kslap.request(kamari,
software_type="ue",
partition_reference="CB5-UE",
filter_kw={"computer_guid": CB5},
partition_parameter_kw={"_": json.dumps({
})})
uRU = copy.deepcopy(RU1)
uRU['cpri_link']['sfp_port'] = 3
uRU['mac_addr'] = '90:A9:F7:C0:00:04'
uCELL = {
'ue_cell_type': 'lte',
'rf_mode': 'fdd',
'dl_earfcn': 300,
'bandwidth': '10 MHz',
'ru': {
'ru_type': 'ru_ref',
'ru_ref': 'CB5-UE.RU',
}
}
kslap.iSHARED(iuesim, 'CB5-UE.RU', uRU)
kslap.iSHARED(iuesim, 'CB5-UE.CELL', uCELL)
software/ors-amarisoft/k/krequest-ors.enb.old
View file @
1d6a2d8d
...
@@ -72,7 +72,7 @@ CELL1_a = {
...
@@ -72,7 +72,7 @@ CELL1_a = {
'ru': RU1, # RU definition embedded into CELL
'ru': RU1, # RU definition embedded into CELL
}
}
iCELL1_a = kslap.i
ENB
(enb1, 'CELL1_a', CELL1_a)
iCELL1_a = kslap.i
SHARED
(enb1, 'CELL1_a', CELL1_a)
CELL1_b = {
CELL1_b = {
...
@@ -88,7 +88,7 @@ CELL1_b = {
...
@@ -88,7 +88,7 @@ CELL1_b = {
}
}
}
}
iCELL1_b = kslap.i
ENB
(enb1, 'CELL1_b', CELL1_b)
iCELL1_b = kslap.i
SHARED
(enb1, 'CELL1_b', CELL1_b)
RU2_a = {
RU2_a = {
...
@@ -116,10 +116,10 @@ RU2_b['cpri_link']['sfp_port'] = 1
...
@@ -116,10 +116,10 @@ RU2_b['cpri_link']['sfp_port'] = 1
RU2_b['tx_gain'] += 10
RU2_b['tx_gain'] += 10
RU2_b['rx_gain'] += 10
RU2_b['rx_gain'] += 10
iRU2_a = kslap.i
ENB
(enb1, 'RU2_a', RU2_a)
iRU2_a = kslap.i
SHARED
(enb1, 'RU2_a', RU2_a)
iRU2_b = kslap.i
ENB
(enb1, 'RU2_b', RU2_b)
iRU2_b = kslap.i
SHARED
(enb1, 'RU2_b', RU2_b)
kslap.i
ENB
(enb1, 'CELL2_a', {
kslap.i
SHARED
(enb1, 'CELL2_a', {
'cell_type': 'lte',
'cell_type': 'lte',
'rf_mode': 'fdd',
'rf_mode': 'fdd',
'bandwidth': '5 MHz',
'bandwidth': '5 MHz',
...
@@ -132,7 +132,7 @@ kslap.iENB(enb1, 'CELL2_a', {
...
@@ -132,7 +132,7 @@ kslap.iENB(enb1, 'CELL2_a', {
}
}
})
})
kslap.i
ENB
(enb1, 'CELL2_b', {
kslap.i
SHARED
(enb1, 'CELL2_b', {
'cell_type': 'nr',
'cell_type': 'nr',
'rf_mode': 'fdd',
'rf_mode': 'fdd',
'bandwidth': 5,
'bandwidth': 5,
...
...
software/ors-amarisoft/k/kslap.py
View file @
1d6a2d8d
...
@@ -99,15 +99,16 @@ def iSIM(core, sim_n):
...
@@ -99,15 +99,16 @@ def iSIM(core, sim_n):
})})
})})
return
sim
return
sim
# iENB adds to enb a shared instance with specified reference and parameters.
# iSHARED adds to parent instance a shared instance with specified reference and parameters.
def
iENB
(
enb
,
ref
,
kw
):
def
iSHARED
(
iparent
,
ref
,
kw
):
enb_ref
=
ref_of_instance
(
enb
)
i_ref
=
ref_of_instance
(
iparent
)
enb_guid
=
enb
.
getInstanceGuid
()
i_guid
=
iparent
.
getInstanceGuid
()
enb_sr
=
enb
.
getSoftwareRelease
()
i_sr
=
iparent
.
getSoftwareRelease
()
ishared
=
request
(
enb_sr
,
i_type
=
iparent
.
slap_software_type
software_type
=
"enb"
,
ishared
=
request
(
i_sr
,
software_type
=
i_type
,
partition_reference
=
ref
,
partition_reference
=
ref
,
shared
=
True
,
shared
=
True
,
filter_kw
=
{
"instance_guid"
:
enb
_guid
},
filter_kw
=
{
"instance_guid"
:
i
_guid
},
partition_parameter_kw
=
{
"_"
:
json
.
dumps
(
kw
)})
partition_parameter_kw
=
{
"_"
:
json
.
dumps
(
kw
)})
return
ishared
return
ishared
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment