Skip to content

Commit 834f78b

Browse files
kthare10kthare10
committed
renamed package
1 parent c68e1f0 commit 834f78b

File tree

496 files changed

+2865
-2866
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+2865
-2866
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ dmypy.json
129129
.pyre/
130130
logs
131131
.idea
132-
fabric/message_bus
132+
fabric_cf/message_bus

‎Dockerfile-auth

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EXPOSE 11000
1515
COPY requirements.txt /usr/src/app/
1616
RUN pip3 install --no-cache-dir -r requirements.txt
1717
RUN mkdir -p "/etc/fabric/message_bus/schema"
18-
RUN cp /usr/local/lib/python3.8/site-packages/fabric/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
18+
RUN cp /usr/local/lib/python3.8/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
1919

2020
RUN pip3 install git+https://github.com/fabric-testbed/ControlFramework.git
2121

‎Dockerfile-broker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ EXPOSE 11000
1515
COPY requirements.txt /usr/src/app/
1616
RUN pip3 install --no-cache-dir -r requirements.txt
1717
RUN mkdir -p "/etc/fabric/message_bus/schema"
18-
RUN cp /usr/local/lib/python3.8/site-packages/fabric/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
18+
RUN cp /usr/local/lib/python3.8/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
1919

2020
RUN pip3 install git+https://github.com/fabric-testbed/ControlFramework.git
2121

‎Dockerfile-orchestrator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EXPOSE 8700
1616
COPY requirements.txt /usr/src/app/
1717
RUN pip3 install --no-cache-dir -r requirements.txt
1818
RUN mkdir -p "/etc/fabric/message_bus/schema"
19-
RUN cp /usr/local/lib/python3.8/site-packages/fabric/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
19+
RUN cp /usr/local/lib/python3.8/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
2020

2121
RUN pip3 install git+https://github.com/fabric-testbed/ControlFramework.git
2222

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Fabric Control Framework has 3 actors
88
- Aggregate Manager
99

1010
## Broker
11-
Broker is an agent of CF that collects resource availability information from multiple aggregate managers and can make resource promises on their behalf. More details can be found [here](./fabric/broker/Readme.md)
11+
Broker is an agent of CF that collects resource availability information from multiple aggregate managers and can make resource promises on their behalf. More details can be found [here](fabric_cf/broker/Readme.md)
1212

1313
## Aggregate Manager
14-
AM is a CF agent responsible for managing aggregate resources. Is under the control of the owner of the aggregate. Provides promises of resources to brokers and controllers/ orchestrators. More details can be found [here](./fabric/authority/Readme.md)
14+
AM is a CF agent responsible for managing aggregate resources. Is under the control of the owner of the aggregate. Provides promises of resources to brokers and controllers/ orchestrators. More details can be found [here](fabric_cf/authority/Readme.md)
1515

1616
## Orchestrator
17-
Orchestrator is an agent of CF that makes allocation decisions (embedding) of user requests into available resources. Communicates with user to collect slice requests, communicates with broker or aggregate managers to collect resource promises, communicates with aggregate managers to provision promised resources. Creates slices, configures resources, maintains their state, modifies slices and slivers. More details can be found [here](./fabric/orchestrator/Readme.md)
17+
Orchestrator is an agent of CF that makes allocation decisions (embedding) of user requests into available resources. Communicates with user to collect slice requests, communicates with broker or aggregate managers to collect resource promises, communicates with aggregate managers to provision promised resources. Creates slices, configures resources, maintains their state, modifies slices and slivers. More details can be found [here](fabric_cf/orchestrator/Readme.md)
1818

1919
## Requirements
2020
Python 3.7+

‎authority.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
pip3 install git+https://github.com/fabric-testbed/InformationModel.git
44
pip3 install git+https://github.com/fabric-testbed/MessageBus.git
55
mkdir -p "/etc/fabric/message_bus/schema"
6-
cp /usr/local/lib/python3.8/site-packages/fabric/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
6+
cp /usr/local/lib/python3.8/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
77
pip3 install git+https://github.com/fabric-testbed/ControlFramework.git
88

99

10-
python3 -m fabric.authority
10+
python3 -m fabric_cf.authority

‎broker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
pip3 install git+https://github.com/fabric-testbed/InformationModel.git
44
pip3 install git+https://github.com/fabric-testbed/MessageBus.git
55
mkdir -p "/etc/fabric/message_bus/schema"
6-
cp /usr/local/lib/python3.8/site-packages/fabric/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
6+
cp /usr/local/lib/python3.8/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
77
pip3 install git+https://github.com/fabric-testbed/ControlFramework.git
88

99

10-
python3 -m fabric.broker
10+
python3 -m fabric_cf.broker

‎config.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,30 +101,30 @@ actor:
101101
- controls:
102102
- control:
103103
- type: site.vm
104-
- module: fabric.actor.core.policy.simple_vm_control
104+
- module: fabric_cf.actor.core.policy.simple_vm_control
105105
- class: SimpleVMControl
106106
- control:
107107
- type: site.baremetalce
108-
- module: fabric.actor.core.policy.simple_vm_control
108+
- module: fabric_cf.actor.core.policy.simple_vm_control
109109
- class: SimpleVMControl
110110
- control:
111111
- type: site.vlan
112-
- module: fabric.actor.core.policy.vlan_control
112+
- module: fabric_cf.actor.core.policy.vlan_control
113113
- class: VlanControl
114114
- control:
115115
- type: site.lun
116-
- module: fabric.actor.core.policy.lun_control
116+
- module: fabric_cf.actor.core.policy.lun_control
117117
- class: LUNControl
118118
- pools:
119119
- pool:
120-
- factory.module: fabric.actor.boot.inventory.resource_pool_factory
120+
- factory.module: fabric_cf.actor.boot.inventory.resource_pool_factory
121121
- factory.class: ResourcePoolFactory
122122
- type: site.vm
123123
- label: VM AM
124124
- description: VM AM
125125
- units: 100
126126
- handler:
127-
- module: fabric.actor.plugins.vm
127+
- module: fabric_cf.actor.plugins.vm
128128
- class: Dummy
129129
- properties:
130130
- ec2.keys: config/ec2
@@ -133,20 +133,20 @@ actor:
133133
- attribute:
134134
- key: resource.class.invfortype
135135
- type: Class
136-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
136+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
137137
- properties:
138138
- substrate.file: config/neo4j/rockyvmsite.xml
139139
- ip.subnet: 255.255.255.0
140140
- ip.list: 192.168.1.2/24
141141
- pool:
142-
- factory.module: fabric.actor.boot.inventory.resource_pool_factory
142+
- factory.module: fabric_cf.actor.boot.inventory.resource_pool_factory
143143
- factory.class: ResourcePoolFactory
144144
- type: site.baremetalce
145145
- label: xCAT node
146146
- description: A bare metal machine
147147
- units: 2
148148
- handler:
149-
- module: fabric.actor.plugins.baremetal
149+
- module: fabric_cf.actor.plugins.baremetal
150150
- class: Dummy
151151
- properties:
152152
- xcat.site.properties: config/xcat.site.properties
@@ -155,44 +155,44 @@ actor:
155155
- ip.subnet: 255.255.255.0
156156
- ip.list: 192.168.1.2/24
157157
- pool:
158-
- factory.module: fabric.actor.boot.inventory.ResourcePoolFactory
158+
- factory.module: fabric_cf.actor.boot.inventory.ResourcePoolFactory
159159
- factory.class: ResourcePoolFactory
160160
- type: site.vlan
161161
- label: Net AM
162162
- description: Net AM
163163
- units: 100
164164
- handler:
165-
- module: fabric.actor.plugins.vlan
165+
- module: fabric_cf.actor.plugins.vlan
166166
- class: Dummy
167167
- properties:
168168
- quantum-vlan.properties: config/quantum-vlan.properties
169169
- attributes:
170170
- attribute:
171171
- key: resource.class.invfortype
172172
- type: Class
173-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
173+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
174174
- properties:
175175
- substrate.file: config/neo4j/rockyvmsite.xml
176176
- vlan.range.num: 100
177177
- vlan.tag.start0: 1
178178
- vlan.tag.end0: 100
179179
- pool:
180-
- factory.module: fabric.actor.boot.inventory.resource_pool_factory
180+
- factory.module: fabric_cf.actor.boot.inventory.resource_pool_factory
181181
- factory.class: ResourcePoolFactory
182182
- type: site.lun
183183
- label: OS internal lun
184184
- description: OS internal lun
185185
- units: 100
186186
- handler:
187-
- module: fabric.actor.plugins.storage
187+
- module: fabric_cf.actor.plugins.storage
188188
- class: Dummy
189189
- properties:
190190
- storage_service.site.properties: config/storage_service.site.properties
191191
- attributes:
192192
- attribute:
193193
- key: resource.class.invfortype
194194
- type: Class
195-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
195+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
196196
- properties:
197197
- substrate.file: config/neo4j/rockyvmsite.xml
198198
- lun.range.num: 100

‎config/config.broker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ actor:
111111
- description: Broker
112112
- kafka-topic: broker-topic
113113
- policy:
114-
- module: fabric.actor.core.policy.broker_simpler_units_policy
114+
- module: fabric_cf.actor.core.policy.broker_simpler_units_policy
115115
- class: BrokerSimplerUnitsPolicy
116116
- properties:
117117
- queue.type: fifo

‎config/config.net-am.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,18 +115,18 @@ actor:
115115
- label: Network Vlan
116116
- description: Network Vlan
117117
- handler:
118-
- module: fabric.actor.plugins.vlan
118+
- module: fabric_cf.actor.plugins.vlan
119119
- class: Dummy
120120
- properties:
121121
- quantum-vlan.properties: config/quantum-vlan.properties
122122
- attributes:
123123
- attribute:
124124
- key: resource.class.invfortype
125125
- type: Class
126-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
126+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
127127
- control:
128128
- type: site.vlan
129-
- module: fabric.actor.core.policy.vlan_control
129+
- module: fabric_cf.actor.core.policy.vlan_control
130130
- class: VlanControl
131131
peers:
132132
- peer:

‎config/config.orchestrator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ actor:
112112
- description: orchestrator
113113
- kafka-topic: orchestrator-topic
114114
- policy:
115-
- module: fabric.actor.core.policy.controller_ticket_review_policy
115+
- module: fabric_cf.actor.core.policy.controller_ticket_review_policy
116116
- class: ControllerTicketReviewPolicy
117117

118118
peers:

‎config/config.site.am.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,34 +120,34 @@ actor:
120120
- label: VM AM
121121
- description: VM AM
122122
- handler:
123-
- module: fabric.actor.plugins.vm
123+
- module: fabric_cf.actor.plugins.vm
124124
- class: Dummy
125125
- properties:
126126
- ec2.keys: config/ec2
127127
- ec2.site.properties: config/ec2.site.properties
128128
- control:
129129
- type: site.vm
130-
- module: fabric.actor.core.policy.simple_vm_control
130+
- module: fabric_cf.actor.core.policy.simple_vm_control
131131
- class: SimpleVMControl
132132
- attributes:
133133
- attribute:
134134
- key: resource.class.invfortype
135135
- type: Class
136-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
136+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
137137
- resource:
138138
- resource_module: fim.slivers.network_node
139139
- resource_class: Node
140140
- type: site.baremetal
141141
- label: Baremetal AM
142142
- description: Baremetal AM
143143
- handler:
144-
- module: fabric.actor.plugins.baremetal
144+
- module: fabric_cf.actor.plugins.baremetal
145145
- class: Dummy
146146
- properties:
147147
- xcat.site.properties: config/xcat.site.properties
148148
- control:
149149
- type: site.vm
150-
- module: fabric.actor.core.policy.simple_vm_control
150+
- module: fabric_cf.actor.core.policy.simple_vm_control
151151
- class: SimpleVMControl
152152
- resource:
153153
- resource_module: fim.slivers.attached_pci_devices
@@ -156,18 +156,18 @@ actor:
156156
- label: Network Vlan
157157
- description: Network Vlan
158158
- handler:
159-
- module: fabric.actor.plugins.vlan
159+
- module: fabric_cf.actor.plugins.vlan
160160
- class: Dummy
161161
- properties:
162162
- quantum-vlan.properties: config/quantum-vlan.properties
163163
- attributes:
164164
- attribute:
165165
- key: resource.class.invfortype
166166
- type: Class
167-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
167+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
168168
- control:
169169
- type: site.vlan
170-
- module: fabric.actor.core.policy.vlan_control
170+
- module: fabric_cf.actor.core.policy.vlan_control
171171
- class: VlanControl
172172
- resource:
173173
- resource_module: fim.slivers.network_attached_storage
@@ -176,18 +176,18 @@ actor:
176176
- label: OS internal lun
177177
- description: OS internal lun
178178
- handler:
179-
- module: fabric.actor.plugins.storage
179+
- module: fabric_cf.actor.plugins.storage
180180
- class: Dummy
181181
- properties:
182182
- storage_service.site.properties: config/storage_service.site.properties
183183
- attributes:
184184
- attribute:
185185
- key: resource.class.invfortype
186186
- type: Class
187-
- value: fabric.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
187+
- value: fabric_cf.actor.core.policy.simpler_units_inventory.SimplerUnitsInventory
188188
- control:
189189
- type: site.lun
190-
- module: fabric.actor.core.policy.lun_control
190+
- module: fabric_cf.actor.core.policy.lun_control
191191
- class: LUNControl
192192
peers:
193193
- peer:

‎docker-compose-kafka.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ services:
6767
SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: SSL
6868

6969
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.truststore.jks
70-
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_PASSWORD: fabric
70+
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_PASSWORD: fabric
7171
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.keystore.jks
72-
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_PASSWORD: fabric
73-
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEY_PASSWORD: fabric
72+
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_PASSWORD: fabric
73+
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEY_PASSWORD: fabric
7474
SCHEMA_REGISTRY_KAFKASTORE_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: " "
7575

7676
SCHEMA_REGISTRY_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.keystore.jks
77-
SCHEMA_REGISTRY_SSL_KEYSTORE_PASSWORD: fabric
78-
SCHEMA_REGISTRY_SSL_KEY_PASSWORD: fabric
77+
SCHEMA_REGISTRY_SSL_KEYSTORE_PASSWORD: fabric
78+
SCHEMA_REGISTRY_SSL_KEY_PASSWORD: fabric
7979
SCHEMA_REGISTRY_DEBUG: 'true'

‎docker-compose-test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ services:
6767
SCHEMA_REGISTRY_KAFKASTORE_SECURITY_PROTOCOL: SSL
6868

6969
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.truststore.jks
70-
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_PASSWORD: fabric
70+
SCHEMA_REGISTRY_KAFKASTORE_SSL_TRUSTSTORE_PASSWORD: fabric
7171
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.keystore.jks
72-
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_PASSWORD: fabric
73-
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEY_PASSWORD: fabric
72+
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEYSTORE_PASSWORD: fabric
73+
SCHEMA_REGISTRY_KAFKASTORE_SSL_KEY_PASSWORD: fabric
7474
SCHEMA_REGISTRY_KAFKASTORE_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: " "
7575

7676
SCHEMA_REGISTRY_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/kafka.schemaregistry.keystore.jks
77-
SCHEMA_REGISTRY_SSL_KEYSTORE_PASSWORD: fabric
78-
SCHEMA_REGISTRY_SSL_KEY_PASSWORD: fabric
77+
SCHEMA_REGISTRY_SSL_KEYSTORE_PASSWORD: fabric
78+
SCHEMA_REGISTRY_SSL_KEY_PASSWORD: fabric
7979
SCHEMA_REGISTRY_DEBUG: 'true'
8080

8181
neo4j:

‎fabric/actor/core/.DS_Store

-10 KB
Binary file not shown.

‎fabric/orchestrator/swagger_server/controllers/default_controller.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎fabric/orchestrator/swagger_server/models/__init__.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎fabric/__init__.py renamed to ‎fabric_cf/__init__.py

File renamed without changes.

‎fabric/actor/__init__.py renamed to ‎fabric_cf/actor/__init__.py

File renamed without changes.

‎fabric/actor/boot/__init__.py renamed to ‎fabric_cf/actor/boot/__init__.py

File renamed without changes.

‎fabric/actor/boot/configuration.py renamed to ‎fabric_cf/actor/boot/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from datetime import datetime
2727
from typing import List
2828

29-
from fabric.actor.core.common.constants import Constants
29+
from fabric_cf.actor.core.common.constants import Constants
3030

3131
"""
3232
Implements various classes for reading and loading the information from config file

‎fabric/actor/boot/configuration_exception.py renamed to ‎fabric_cf/actor/boot/configuration_exception.py

File renamed without changes.

‎fabric/actor/boot/configuration_loader.py renamed to ‎fabric_cf/actor/boot/configuration_loader.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
# Author: Komal Thareja (kthare10@renci.org)
2626
import yaml
2727

28-
from fabric.actor.boot.configuration import Configuration
29-
from fabric.actor.boot.configuration_exception import ConfigurationException
30-
from fabric.actor.boot.configuration_processor import ConfigurationProcessor
28+
from fabric_cf.actor.boot.configuration import Configuration
29+
from fabric_cf.actor.boot.configuration_exception import ConfigurationException
30+
from fabric_cf.actor.boot.configuration_processor import ConfigurationProcessor
3131

3232

3333
class ConfigurationLoader:

0 commit comments

Comments
 (0)