Commit ca8d23f9 authored by Mohammad Ismaeel's avatar Mohammad Ismaeel
Browse files

Optical Link Integral

parent 72bbd345

.context.log.swp

0 → 100644
+8 KiB

File added.

No diff preview for this file type.

View file

config.lo

0 → 100644
+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?><data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"><interfaces xmlns="http://openconfig.net/yang/interfaces"><interface><name>eth0</name><config><name>eth0</name><enabled>true</enabled></config><ipv4 xmlns="http://openconfig.net/yang/interfaces/ip"><addresses><address><ip>192.168.1.1</ip><config><ip>192.168.1.1</ip><prefix-length>24</prefix-length></config></address></addresses></ipv4></interface></interfaces><components xmlns="http://openconfig.net/yang/platform"><component><name>channel-1</name><config><name>channel-1</name></config><state><name>channel-1</name><type xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:OPTICAL_CHANNEL</type></state><optical-channel xmlns="http://openconfig.net/yang/terminal-device"><config><frequency>191600000</frequency><target-output-power>100.0</target-output-power><operational-mode>0</operational-mode><line-port>transceiver-1</line-port></config><state><frequency>191600000</frequency><target-output-power>0.0</target-output-power><operational-mode>0</operational-mode><line-port>transceiver-1</line-port><group-id>1</group-id><output-power><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max><interval>0</interval></output-power><input-power><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max><interval>0</interval></input-power><laser-bias-current><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max><interval>0</interval></laser-bias-current><chromatic-dispersion><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max></chromatic-dispersion><polarization-mode-dispersion><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max></polarization-mode-dispersion><second-order-polarization-mode-dispersion><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max></second-order-polarization-mode-dispersion><polarization-dependent-loss><instant>0.0</instant><avg>0.0</avg><min>0.0</min><max>0.0</max><interval>0</interval></polarization-dependent-loss></state></optical-channel></component><component><name>device</name><config><name>device</name></config><state><name>MellanoxSwitch</name><type xmlns:oc-platform-types="http://openconfig.net/yang/platform-types">oc-platform-types:OPERATING_SYSTEM</type><mfg-name>SSSA-CNIT</mfg-name><hardware-version>1.0.0</hardware-version><firmware-version>1.0.0</firmware-version><software-version>1.0.0</software-version><serial-no>610610</serial-no></state></component><component><name>port-1</name><config><name>port-1</name></config><state><name>port-1</name><type xmlns:oc-platform-types="http://openconfig.net/yang/platform-types">oc-platform-types:PORT</type></state><properties><property><name>odtn-port-type</name><config><name>odtn-port-type</name><value>line</value></config><state><name>odtn-port-type</name><value>line</value></state></property><property><name>onos-index</name><config><name>onos-index</name><value>4</value></config><state><name>onos-index</name><value>4</value></state></property></properties><subcomponents><subcomponent><name>channel-1</name><config><name>channel-1</name></config><state><name>channel-1</name></state></subcomponent></subcomponents></component><component><name>transceiver-1</name><config><name>transceiver-1</name></config><state><name>transceiver-1</name><type xmlns:oc-platform-types="http://openconfig.net/yang/platform-types">oc-platform-types:TRANSCEIVER</type></state><transceiver xmlns="http://openconfig.net/yang/platform/transceiver"><config><enabled>true</enabled><form-factor-preconf xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:QSFP56_DD_TYPE1</form-factor-preconf><ethernet-pmd-preconf xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:ETH_400GBASE_ZR</ethernet-pmd-preconf><fec-mode xmlns:oc-platform-types="http://openconfig.net/yang/platform-types">oc-platform-types:FEC_AUTO</fec-mode><module-functional-type xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:TYPE_DIGITAL_COHERENT_OPTIC</module-functional-type></config><state><enabled>true</enabled><form-factor-preconf xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:QSFP56_DD_TYPE1</form-factor-preconf><ethernet-pmd-preconf xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:ETH_400GBASE_ZR</ethernet-pmd-preconf><fec-mode xmlns:oc-platform-types="http://openconfig.net/yang/platform-types">oc-platform-types:FEC_AUTO</fec-mode><module-functional-type xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:TYPE_DIGITAL_COHERENT_OPTIC</module-functional-type><vendor>Cisco</vendor><vendor-part>400zr-QSFP-DD</vendor-part><vendor-rev>01</vendor-rev><serial-no>1567321</serial-no></state><physical-channels><channel><index>1</index><config><index>1</index><associated-optical-channel>channel-1</associated-optical-channel></config></channel></physical-channels></transceiver></component></components><bgp-instance xmlns="http://openconfig.net/yang/protocols"><bgp><neighbors><neighbor><neighbor-address>192.168.1.1</neighbor-address><config><neighbor-address>192.168.1.1</neighbor-address><neighbor-port>88</neighbor-port><enabled>true</enabled><peer-as>65432</peer-as></config></neighbor></neighbors></bgp></bgp-instance><terminal-device xmlns="http://openconfig.net/yang/terminal-device"><logical-channels><channel><index>1</index><config><index>1</index><description>Logical channel 1</description><admin-state>DISABLED</admin-state><logical-channel-type xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:PROT_OTN</logical-channel-type><loopback-mode>NONE</loopback-mode></config><state><index>1</index><description>Logical channel 1</description><admin-state>DISABLED</admin-state><logical-channel-type xmlns:oc-opt-types="http://openconfig.net/yang/transport-types">oc-opt-types:PROT_OTN</logical-channel-type><loopback-mode>NONE</loopback-mode><link-state>UP</link-state></state><ingress><config><transceiver>transceiver-1</transceiver></config><state><transceiver>transceiver-1</transceiver></state></ingress><logical-channel-assignments><assignment><index>1</index><config><index>1</index><description>Optical channel assigned 100</description><assignment-type>OPTICAL_CHANNEL</assignment-type><optical-channel>channel-1</optical-channel><allocation>100.0</allocation></config><state><index>1</index><description>Optical channel assigned 100</description><assignment-type>OPTICAL_CHANNEL</assignment-type><optical-channel>channel-1</optical-channel><allocation>100.0</allocation></state></assignment></logical-channel-assignments></channel></logical-channels><operational-modes><mode><mode-id>1</mode-id><state><mode-id>1</mode-id><description>FEC1</description><vendor-id>Ericsson</vendor-id></state></mode><mode><mode-id>2</mode-id><state><mode-id>2</mode-id><description>FEC2</description><vendor-id>Ericsson</vendor-id></state></mode></operational-modes></terminal-device><aaa xmlns="http://tail-f.com/ns/aaa/1.1"><authentication><users><user><name>admin</name><uid>9000</uid><gid>100</gid><password>$1$HWfCFyTg$TOxt04aLi5ONWrSB8X94U.</password><ssh_keydir>/var/confd/homes/admin/.ssh</ssh_keydir><homedir>/var/confd/homes/admin</homedir></user><user><name>oper</name><uid>9003</uid><gid>103</gid><password>$1$D8R6MYXb$ah52S1b/zOYSlbVU9MS/21</password><ssh_keydir>/var/confd/homes/oper/.ssh</ssh_keydir><homedir>/var/confd/homes/oper</homedir></user><user><name>optical</name><uid>9001</uid><gid>101</gid><password>$1$qJM5YOJZ$Y1ECCKsRIgMFJBk.hrjkv1</password><ssh_keydir>/var/confd/homes/optical/.ssh</ssh_keydir><homedir>/var/confd/homes/optical</homedir></user><user><name>packet</name><uid>9002</uid><gid>102</gid><password>$1$Fmz.hLNd$8yG5nYZhSPNPjinrCWId8.</password><ssh_keydir>/var/confd/homes/packet/.ssh</ssh_keydir><homedir>/var/confd/homes/packet</homedir></user><user><name>private</name><uid>9005</uid><gid>103</gid><password>$1$4uQVo9HU$xjyOZc8JhotXBtfcFV7MX.</password><ssh_keydir>/var/confd/homes/private/.ssh</ssh_keydir><homedir>/var/confd/homes/private</homedir></user><user><name>public</name><uid>9004</uid><gid>100</gid><password>$1$YhqvvCDs$LAGH/GQUMGMbqTUMWpapD1</password><ssh_keydir>/var/confd/homes/public/.ssh</ssh_keydir><homedir>/var/confd/homes/public</homedir></user></users></authentication><ios><level><nr>0</nr><prompt>\h&gt; </prompt></level><level><nr>15</nr><prompt>\h# </prompt></level><privilege><mode>exec</mode><level><nr>0</nr><command><name>action</name></command><command><name>autowizard</name></command><command><name>enable</name></command><command><name>exit</name></command><command><name>help</name></command><command><name>startup</name></command></level><level><nr>15</nr><command><name>configure</name></command></level></privilege></ios></aaa><nacm xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-acm"><enable-nacm>true</enable-nacm><read-default>permit</read-default><write-default>permit</write-default><exec-default>permit</exec-default><enable-external-groups>true</enable-external-groups><groups><group><name>admin</name><user-name>admin</user-name><user-name>private</user-name></group><group><name>oper</name><user-name>oper</user-name><user-name>public</user-name></group><group><name>opt</name><user-name>optical</user-name></group><group><name>pck</name><user-name>packet</user-name></group></groups><rule-list><name>any-group</name><group>*</group><rule><name>get</name><module-name>*</module-name><path>/</path><access-operations>read</access-operations><action>permit</action></rule><rule><name>tailf-aaa-authentication</name><module-name>tailf-aaa</module-name><path>/aaa/authentication/users/user[name='$USER']</path><access-operations>read update</access-operations><action>permit</action></rule><rule><name>tailf-aaa-user</name><module-name>tailf-aaa</module-name><path>/user[name='$USER']</path><access-operations>create read update delete</access-operations><action>permit</action></rule><rule><name>tailf-webui-user</name><module-name>tailf-webui</module-name><path>/webui/data-stores/user-profile[username='$USER']</path><access-operations>create read update delete</access-operations><action>permit</action></rule></rule-list><rule-list><name>packet</name><group>pck</group><rule><name>vlan</name><module-name>vlan</module-name><path>/switched-vlans</path><access-operations>create read update delete</access-operations><action>permit</action></rule><rule><name>terminal-device</name><module-name>*</module-name><path>/terminal-device</path><access-operations>create update delete</access-operations><action>deny</action></rule><rule><name>components</name><module-name>*</module-name><path>/components</path><access-operations>create update delete</access-operations><action>deny</action></rule></rule-list><rule-list><name>optical</name><group>opt</group><rule><name>terminal-device</name><module-name>*</module-name><path>/terminal-device</path><access-operations>create read update delete</access-operations><action>permit</action></rule><rule><name>components</name><module-name>*</module-name><path>/components</path><access-operations>create read update delete</access-operations><action>permit</action></rule><rule><name>vlan</name><module-name>vlan</module-name><path>/switched-vlans</path><access-operations>create update delete</access-operations><action>deny</action></rule></rule-list><rule-list><name>admin</name><group>admin</group><rule><name>any-access</name><action>permit</action></rule></rule-list></nacm></data>

deploy/tfs.sh

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ printf "\n" 
for COMPONENT in $TFS_COMPONENTS; do

    echo "Waiting for '$COMPONENT' component..."

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

 

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=90s deployment/${COMPONENT_OBJNAME}service

    WAIT_EXIT_CODE=$?

my_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"



# Set the list of components, separated by spaces, you want to build images for, and deploy.

export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice nbi webui "

export TFS_COMPONENTS="context device pathcomp opticalcontroller service slice  webui "



# Uncomment to activate Monitoring

#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
@@ -102,7 +102,7 @@ export CRDB_DEPLOY_MODE="single" 
export CRDB_DROP_DATABASE_IF_EXISTS=""



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""

export CRDB_REDEPLOY="YES"





# ----- NATS -------------------------------------------------------------------

proto/context.proto

+28 −26
Original line number Diff line number Diff line
@@ -83,8 +83,9 @@ service ContextService { 
  rpc DeleteOpticalConfig(OpticalConfigId) returns (Empty         ) {}



  rpc SetOpticalLink     (OpticalLink    ) returns (Empty                 ) {}

  rpc GetOpticalLink     (OpticalLinkId  ) returns (OpticalLink           ) {}

  rpc GetFiber           (FiberId        ) returns (Fiber                 ) {}

  rpc GetOpticalLink     (LinkId  ) returns (OpticalLink           ) {}

  rpc DeleteOpticalLink           (LinkId        ) returns (Empty                 ) {}

  rpc GetOpticalLinkList (Empty)    returns (OpticalLinkList)                {}

 }



// ----- Generic -------------------------------------------------------------------------------------------------------
@@ -149,6 +150,8 @@ message Topology { 
  string name = 2;

  repeated DeviceId device_ids = 3;

  repeated LinkId link_ids = 4;



  repeated LinkId optical_link_ids=5;

}



message TopologyDetails {
@@ -156,6 +159,8 @@ message TopologyDetails { 
  string name = 2;

  repeated Device devices = 3;

  repeated Link links = 4;

  

  repeated OpticalLink optical_links =5 ;

}



message TopologyIdList {
@@ -647,37 +652,34 @@ message OpticalConfigEvent { 


// ---- Optical Link ----



message OpticalLinkId {

  Uuid optical_link_uuid = 1;

}

message OpticalEndPointId {

  

message FiberId {

  Uuid fiber_uuid = 1;

  DeviceId device_id = 2;

  Uuid endpoint_uuid = 3;

}



message Fiber {

  string ID = 10;

  string src_port = 1;

  string dst_port = 2;

  string local_peer_port =  3;

  string remote_peer_port = 4;

  repeated int32 c_slots = 5;

  repeated int32 l_slots = 6;

  repeated int32 s_slots = 7;

  float length = 8;

  bool used = 9;

  FiberId fiber_uuid = 11;



message OpticalLinkList {

  repeated OpticalLink optical_links = 1;

}







message OpticalLinkDetails {

  float length = 1;

  string source = 2;

  string target = 3;

  repeated Fiber fibers = 4;

  string src_port = 2;

  string dst_port = 3;

  string local_peer_port = 4;

  string remote_peer_port = 5 ;

  bool used = 6 ; 

  map< string ,int32 > c_slots = 7;

  map< string ,int32 > l_slots = 8;

  map< string ,int32 > s_slots = 9;

}



message OpticalLink {

  string name = 1;

  OpticalLinkDetails details = 2;

  OpticalLinkId optical_link_uuid = 3;

  OpticalLinkDetails optical_details = 2;

  LinkId link_id = 3;

 repeated EndPointId link_endpoint_ids=4;

}