Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

WIP 2025-07-31 Citycom OAN Api WIP

Browse Source
This commit is contained in:
Frank Schubert
2025-07-31 16:20:31 +02:00
parent c44a429af7
commit 3718ceefdf
10 changed files with 832 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/Api/v1/Modules/Operationaldata/SnoppCitycom.php
View File

@@ -76,9 +76,7 @@ class SnoppCitycom extends Modules\ApiControllerModule
return \mfResponse::InternalServerError(["message" => "Error activating service"]);
}
return false;
return \mfResponse::Ok();
}

46
application/Preorder/Preorder.php
View File

@@ -598,7 +598,7 @@ class Preorder extends mfBaseModel {
}*/
if($preorder->status->code < $status->code && $status->code <= 244) {
$preorder->status_id = $this->status_id;
$preorder->status_id = $status->id;
$preorder->save();
}
}
@@ -669,6 +669,50 @@ class Preorder extends mfBaseModel {
}
public function getNextFreeCtags() {
if(!$this->getProperty("adb_hausnummer")->vlan_stag) {
echo "no stag\n";
return false;
}
$stag = $this->adb_hausnummer->vlan_stag;
$new_ctag = false;
$ctags_per_home = 1;
$network_name = "";
if($this->adb_hausnummer->netzgebiet->source == "citycom-oan-api") {
$network_name = "citycom-oan";
$first_ctag = CITYCOM_OAN_FIRST_CTAG;
$ctags_per_home = count(CITYCOM_OAN_API_SERVICES_FOR_ORDER) + count(CITYCOM_OAN_API_SERVICES_FOR_RESERVATION); // Service VLANS + mgmt VLANS
}
if(!$network_name) {
echo "no network\n";
return false;
}
$last_ctag = PreorderCtag::getLast(["stag" => $stag, "network" => $network_name]);
if(!$last_ctag) {
$new_ctag = $first_ctag;
} else {
$last_ctag_num = $last_ctag->ctag;
$miss = $last_ctag_num % $ctags_per_home;
if($miss) {
$last_ctag_num = $last_ctag_num - $miss;
}
$new_ctag = $last_ctag_num + $ctags_per_home;
}
$new_ctags = [];
for($i = $new_ctag; $i < $new_ctag + $ctags_per_home; $i++) {
$new_ctags[] = $i;
}
return $new_ctags;
}
public function setOrCreateOaid($oaid_attributes = false) {
$campaign = new Preordercampaign($this->preordercampaign_id);
//var_dump($campaign);exit;

199
application/PreorderCitycomOan/PreorderCitycomOan.php Normal file
View File

@@ -0,0 +1,199 @@
<?php
class PreorderCitycomOan extends mfBaseModel {
protected $forcestr = ["product_name","product_info","matchcode"];
private $preorder;
private $creator;
private $editor;
public function getProperty($name) {
if($this->$name == null) {
$classname = ucfirst($name);
$idfield = $name . "_id";
$this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-" . $this->$idfield);
if(!$this->$name) {
$this->$name = new $classname($this->$idfield);
}
if($this->$name->id) {
mfValuecache::singleton()->set("mfObjectmodel-$name-" . $this->$name->id, $this->$name);
return $this->$name;
} else {
return null;
}
}
return $this->$name;
}
/********************************
* Begin static Model functions
*/
public static function create(Array $data) {
$model = new PreorderCitycomOan();
$table_fields = [
"preorder_id", "ont_id", "ont_sn", "ont_gpid", "ont_mac",
"create_by","edit_by","create","edit"
];
foreach($data as $field => $value) {
if(in_array($field, $table_fields)) {
$model->$field = $value;
}
}
$me = new User();
$me->loadMe();
if($model->create_by === null) {
$model->create_by = $me->id;
}
if($model->edit_by === null) {
$model->edit_by = $me->id;
}
return $model;
}
public static function getAll() {
$items = [];
$db = FronkDB::singleton();
$res = $db->select("PreorderCitycomOan", "*", "1 = 1 ORDER BY preorder_id,ont_sn");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new PreorderCitycomOan($data);
}
}
return $items;
}
public static function getFirst($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT PreorderCitycomOan.* FROM PreorderCitycomOan
WHERE $where
ORDER BY preorder_id,ont_sn LIMIT 1";
//var_dump($sql);exit;
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new PreorderCitycomOan($data);
if($item->id) {
return $item;
} else {
return null;
}
}
return null;
}
public static function count($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT COUNT(*) as cnt FROM PreorderCitycomOan
WHERE $where";
//mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
return $data->cnt;
}
return 0;
}
public static function search($filter, $limit = false, $order = false) {
//var_dump($filter);exit;
$items = [];
if(!$order) {
$order = "preorder_id,ont_sn ASC";
}
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT PreorderCitycomOan.* FROM PreorderCitycomOan
LEFT JOIN Preorder ON Preorder.id = PreorderCitycomOan.preorder_id
WHERE $where
ORDER BY $order";
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['count'];
}
}
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[$data->id] = new PreorderCitycomOan($data);
}
}
return $items;
}
private static function getSqlFilter($filter) {
$where = "1=1 ";
if(array_key_exists("preorder_id", $filter)) {
$preorder_id = $filter['preorder_id'];
if(is_numeric($preorder_id)) {
$where .= " AND PreorderCitycomOan.preorder_id=$preorder_id";
}
}
if(array_key_exists("ont_id", $filter)) {
$ont_id = FronkDB::singleton()->escape($filter['ont_id']);
if($ont_id) {
$where .= " AND PreorderCitycomOan.ont_id LIKE '$ont_id'";
}
}
if(array_key_exists("ont_sn", $filter)) {
$ont_sn = FronkDB::singleton()->escape($filter['ont_sn']);
if($ont_sn) {
$where .= " AND PreorderCitycomOan.ont_sn LIKE '$ont_sn'";
}
}
if(array_key_exists("ont_gpid", $filter)) {
$ont_gpid = FronkDB::singleton()->escape($filter['ont_gpid']);
if($ont_gpid) {
$where .= " AND PreorderCitycomOan.ont_gpid LIKE '$ont_gpid'";
}
}
if(array_key_exists("ont_mac", $filter)) {
$ont_mac = FronkDB::singleton()->escape($filter['ont_mac']);
if($ont_mac) {
$where .= " AND PreorderCitycomOan.ont_mac LIKE '$ont_mac'";
}
}
if(array_key_exists("add-where", $filter)) {
$where .= " ".$filter['add-where'];
}
//var_dump($filter, $where);exit;
return $where;
}
}

316
application/PreorderCtag/PreorderCtag.php Normal file
View File

@@ -0,0 +1,316 @@
<?php
class PreorderCtag extends mfBaseModel {
protected $forcestr = ["product_name","product_info","matchcode"];
private $preorder;
private $invoice;
private $adb_wohneinheit;
private $creator;
private $editor;
/**
* Configures Networking equipment depending on network type
*
* @return boolean
*/
public function configureNetwork() {
if($this->network == "citycom-oan-api") {
return $this->configureNetworkCitycom();
}
// nothing to do
return true;
}
private function configureNetworkCitycom() {
$stag = $this->stag;
if(!$stag) {
$this->log->error(__METHOD__.": No stag");
return false;
}
$ctag = $this->ctag;
if(!$ctag) {
$this->log->error(__METHOD__.": No ctag");
return false;
}
$type = $this->service_type;
$preorder = $this->getProperty("preorder");
if(!$preorder->id) {
$this->log->error(__METHOD__.": No preorder id");
return false;
}
$oaid = $preorder->oaid;
if(!$oaid) {
$oaid = $preorder->adb_wohneinheit->oaid;
}
if(!$oaid) {
$this->log->error(__METHOD__.": No OAID in Preorder ".$preorder->id." or Wohneinheit ".$preorder->adb_wohneinheit->id);
return false;
}
$oaid = preg_replace('/[^a-z0-9._-]+/i', '', $oaid);
if(!$oaid) {
$this->log->error(__METHOD__.": OAID invalid after cleanup in Preorder ".$preorder->id." or Wohneinheit ".$preorder->adb_wohneinheit->id);
return false;
}
$stag_name = "";
try {
$ros = new mfRouteros(CITYCOM_OAN_NNI_HOST, CITYCOM_OAN_NNI_USERNAME, CITYCOM_OAN_NNI_PASSWORD, CITYCOM_OAN_NNI_PORT,CITYCOM_OAN_NNI_USE_SSL);
// get all vlan interfaces
$vlans = $ros->get("/interface vlan");
// find stag vlan
foreach($vlans as $vlan) {
if($vlan->{'vlan-id'} == $stag) {
if($stag_name) {
$this->log->error(__METHOD__.": Found VLAN Interface again for stag $stag");
}
$stag_name = $vlan->name;
}
}
if(!$stag_name) {
$this->log->error(__METHOD__.": Vlan for stag $stag not found");
return false;
}
foreach($vlans as $vlan) {
if($vlan->{'interface'} == $stag_name && $vlan->{'vlan-id'} == $this->ctag) {
$this->log->info(__METHOD__." ctag vlan $ctag already exists in stag $stag (ifname: $stag_name)");
return true;
}
}
// ctag not found -> create ctag
$vlan_name = "vl_{$oaid}_{$type}_ctag$ctag";
$vlan_data = [
"vlan-id" => $ctag,
"interface" => $stag_name,
"name" => $vlan_name,
];
if(!$ros->add("/interface vlan", $vlan_data)) {
$this->log->error(__METHOD__." error creating vlan interface for ctag $ctag (ifname: ".$vlan_data["name"].") in stag $stag (ifname: $stag_name)");
return false;
}
// add to interface-list
$ros->add("/interface list member", ["interface" => $vlan_name, "list" => CITYCOM_OAN_API_NNI_IFLIST_NAME]);
return true;
} catch(Exception $e) {
$this->log->error(__METHOD__.": Exception: ".$e->getMessage()."\n".$e->getTraceAsString());
}
return false;
}
public function getProperty($name) {
if($this->$name == null) {
$classname = ucfirst($name);
$idfield = $name . "_id";
$this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-" . $this->$idfield);
if(!$this->$name) {
$this->$name = new $classname($this->$idfield);
}
if($this->$name->id) {
mfValuecache::singleton()->set("mfObjectmodel-$name-" . $this->$name->id, $this->$name);
return $this->$name;
} else {
return null;
}
}
return $this->$name;
}
/********************************
* Begin static Model functions
*/
public static function create(Array $data) {
$model = new PreorderCtag();
$table_fields = [
"preorder_id", "network", "stag", "ctag", "service_type", "deleted",
"create_by","edit_by","create","edit"
];
foreach($data as $field => $value) {
if(in_array($field, $table_fields)) {
$model->$field = $value;
}
}
$me = new User();
$me->loadMe();
if($model->create_by === null) {
$model->create_by = $me->id;
}
if($model->edit_by === null) {
$model->edit_by = $me->id;
}
return $model;
}
public static function getAll() {
$items = [];
$db = FronkDB::singleton();
$res = $db->select("PreorderCtag", "*", "1 = 1 ORDER BY preorder_id,stag,ctag");
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new PreorderCtag($data);
}
}
return $items;
}
public static function getFirst($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT PreorderCtag.* FROM PreorderCtag
WHERE $where
ORDER BY preorder_id,stag,ctag LIMIT 1";
//var_dump($sql);exit;
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new PreorderCtag($data);
if($item->id) {
return $item;
} else {
return null;
}
}
return null;
}
public static function getLast($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT PreorderCtag.* FROM PreorderCtag
WHERE $where
ORDER BY preorder_id DESC,stag DESC,ctag DESC LIMIT 1";
//var_dump($sql);exit;
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
$item = new PreorderCtag($data);
if($item->id) {
return $item;
} else {
return null;
}
}
return null;
}
public static function count($filter) {
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT COUNT(*) as cnt FROM PreorderCtag
WHERE $where";
//mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
$data = $db->fetch_object($res);
return $data->cnt;
}
return 0;
}
public static function search($filter, $limit = false, $order = false) {
//var_dump($filter);exit;
$items = [];
if(!$order) {
$order = "preorder_id,stag,ctag ASC";
}
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$sql = "SELECT PreorderCtag.* FROM PreorderCtag
LEFT JOIN Preorder ON Preorder.id = PreorderCtag.preorder_id
WHERE $where
ORDER BY $order";
if(is_array($limit) && count($limit)) {
if(is_numeric($limit['start']) && is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['start'].", ".$limit['count'];
} elseif(is_numeric($limit['count'])) {
$sql .= " LIMIT ".$limit['count'];
}
}
mfLoghandler::singleton()->debug($sql);
$res = $db->query($sql);
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[$data->id] = new PreorderCtag($data);
}
}
return $items;
}
private static function getSqlFilter($filter) {
$where = "1=1 ";
if(array_key_exists("stag", $filter)) {
$stag = $filter['stag'];
if(is_numeric($stag)) {
$where .= " AND PreorderCtag.stag=$stag";
}
}
if(array_key_exists("ctag", $filter)) {
$ctag = $filter['ctag'];
if(is_numeric($ctag)) {
$where .= " AND PreorderCtag.ctag=$ctag";
}
}
if(array_key_exists("oaid", $filter)) {
$oaid = FronkDB::singleton()->escape($filter['oaid']);
if($oaid) {
$where .= " AND PreorderCtag.oaid = '$oaid'";
}
}
if(array_key_exists("add-where", $filter)) {
$where .= " ".$filter['add-where'];
}
//var_dump($filter, $where);exit;
return $where;
}
}