Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo 5 branch #49

Closed
wants to merge 144 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
1dca674
Learning...
sarthaksharmalive Mar 9, 2017
c2a505b
added line to test.txt
saacg Mar 9, 2017
3a331f2
added line to test Vlad
vsemp Mar 9, 2017
cf16d45
Merge pull request #5 from sarthakjagetia/practicebranch
sarthakjagetia Mar 9, 2017
2e43c70
second Vlad
vsemp Mar 9, 2017
bdb67d1
merging sarthak's changes
saacg Mar 9, 2017
9525997
Merge pull request #6 from saacg/isaacBranch
vsemp Mar 9, 2017
c4a6667
third
vsemp Mar 9, 2017
ade4f76
Merge pull request #7 from vsemp/first
vsemp Mar 9, 2017
c64aad7
deleting test.txt
saacg Mar 9, 2017
a56bf83
adding test-quads-local.sh from course repo
saacg Mar 9, 2017
8c150f0
adding preliminary extension of quads cli to make hil api calls
saacg Mar 9, 2017
918d1e1
implemented PUT request for hil api - tested with projects
saacg Mar 10, 2017
8708a03
transferred rest calls from quads.py into libquads.py as quads member…
saacg Mar 10, 2017
ceb46b0
connected quads.py --define-cloud with hil create_project
saacg Mar 10, 2017
edfbe55
removed code from demo 1
saacg Mar 11, 2017
ec340a2
Merge pull request #8 from saacg/remove-test
vsemp Mar 12, 2017
98a1a7c
Merge pull request #9 from saacg/test-local
vsemp Mar 12, 2017
1672313
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 12, 2017
0b7fb32
removing merge conflicts in quads.py
saacg Mar 12, 2017
1ada28d
added .gitignore, updated libquads.py
saacg Mar 12, 2017
a30fe12
Merge pull request #10 from saacg/extend-for-hil-api
vsemp Mar 12, 2017
0cb4bae
committing testing.txt for git workflow demo
saacg Mar 13, 2017
a0b1d19
added testing.txt for git workflow
Mar 13, 2017
b835863
git workflow demo merger conflict test
djfinn14 Mar 13, 2017
f8ab822
Merge pull request #11 from saacg/isaacTestbranch2
Hugh472 Mar 13, 2017
ba5bd57
merged dummy conflict
Mar 13, 2017
2cb7540
Merged with Isaac's changes
djfinn14 Mar 13, 2017
cb2bf27
Merge pull request #13 from Hugh472/KyleTestBranch1
djfinn14 Mar 13, 2017
86de639
Merge branch 'master' into DanTestBranch
djfinn14 Mar 13, 2017
5c21a00
Merge pull request #12 from djfinn14/DanTestBranch
Hugh472 Mar 13, 2017
d01c45a
deleted testing.txt
Mar 13, 2017
064ec0b
Merge pull request #14 from Hugh472/RemoveTextDoc
saacg Mar 13, 2017
f64cdb9
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 13, 2017
f138e6a
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 14, 2017
8749d92
continued extension for hil - define cloud now creates project and ne…
saacg Mar 15, 2017
3f6911b
extended quads to now be able to attach host to a hil project through…
saacg Mar 15, 2017
e12b918
can attach node to project from quads
saacg Mar 15, 2017
bca1451
changed quads_rest_call to only print when 'GET' request
saacg Mar 15, 2017
1283902
Merge pull request #15 from saacg/hil-from-quads
djfinn14 Mar 15, 2017
1c8b7db
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 15, 2017
f36bc6e
Added ability to detach node and delete project from QUADS
djfinn14 Mar 15, 2017
0d8f215
Merge pull request #16 from djfinn14/quads-hil-prelim
saacg Mar 16, 2017
182c646
added more print statements for the demo
saacg Mar 16, 2017
dcff834
Merge pull request #17 from saacg/demo2-video
Hugh472 Mar 21, 2017
6b25d0d
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 21, 2017
483afbd
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 22, 2017
dd0d4aa
added hardware_services directory
saacg Mar 22, 2017
cbc5743
initial design proposal for decoupling quads from juniper
saacg Mar 22, 2017
86ca38b
Changed name of quads_default_driver.py to juniper_driver.py,
saacg Mar 23, 2017
fc78970
removed extra line in hardware_service.py
saacg Mar 23, 2017
33fa585
added spaces in hardware_service.py
saacg Mar 24, 2017
b09a3c1
Merge pull request #19 from saacg/develop-hardware-service-class
djfinn14 Mar 24, 2017
4125247
implemented first iteration of hardware_service.py - needs testing an…
saacg Mar 24, 2017
a7a2f3c
first attempt at mock driver
djfinn14 Mar 24, 2017
69f0de8
Merge pull request #20 from saacg/implement-hardware-service
djfinn14 Mar 24, 2017
00f5234
first attempt at juniper_driver
djfinn14 Mar 25, 2017
552a05c
Modified and tested the functions we are decoupling
djfinn14 Mar 25, 2017
897c2d5
added __init__.py files to each new directory for packaging
saacg Mar 25, 2017
df58f6f
fixed syntax errors in hardware_service.py
saacg Mar 25, 2017
445fd1c
Merge pull request #21 from saacg/update-config-for-hardware-service
djfinn14 Mar 25, 2017
d5690bf
Update mock_driver.py
saacg Mar 25, 2017
ba3eb04
Merge pull request #22 from djfinn14/decouple
saacg Mar 25, 2017
5c6f6bc
added simple test script for mock_driver
saacg Mar 25, 2017
01af147
expanded test_mock.py
saacg Mar 26, 2017
fbb309d
Merge pull request #23 from saacg/config-hardware-service
djfinn14 Mar 26, 2017
8c86a05
Merge pull request #24 from djfinn14/decouple
saacg Mar 27, 2017
c371a95
importing importlib to quads.py
saacg Mar 27, 2017
70ef7a5
Merge remote-tracking branch 'class/decouple-juniper' into config-har…
saacg Mar 27, 2017
356019b
changed parent to quadsinstance in juniper.py
saacg Mar 27, 2017
f6ebca7
misc changes
saacg Mar 28, 2017
7bc0e4d
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Mar 28, 2017
5e72327
Merge remote-tracking branch 'class/master' into update-class-decoupl…
saacg Mar 28, 2017
668ac81
Merge remote-tracking branch 'class/decouple-juniper' into config-har…
saacg Mar 28, 2017
6ba98ba
added hw service variable to conf file
saacg Mar 28, 2017
93fd9af
IT WORKS
sarthakjagetia Mar 28, 2017
9d6e8d9
hardware_service correctly read in from quads.yaml
saacg Mar 29, 2017
e6b1b04
added hardware service argument to quads constructor
saacg Mar 29, 2017
1d692bb
removed print statements for testing
saacg Mar 29, 2017
8749031
In progress...
invalid-email-address Mar 29, 2017
9063e9f
New File name
invalid-email-address Mar 29, 2017
33f1e03
completed hardware_service config
saacg Mar 29, 2017
ffffc26
removed import of JuniperDriver
saacg Mar 29, 2017
33b251b
Merge pull request #25 from saacg/config-hardware-service
djfinn14 Mar 29, 2017
dcc7ba8
In progress...
invalid-email-address Mar 29, 2017
253fe2f
In progress...
invalid-email-address Mar 29, 2017
9ed92c6
Merge branch 'decouple-juniper' into practice_branch
saacg Mar 29, 2017
a4ed282
Merge pull request #26 from sarthakjagetia/practice_branch
saacg Mar 29, 2017
bae885c
Changed hardware_service to mock and have MockDriver print out kwargs.
djfinn14 Mar 29, 2017
b579433
cleaned up HilDriver
saacg Mar 30, 2017
f558308
Merge pull request #28 from djfinn14/decouple
saacg Mar 30, 2017
7b01cde
merged newest decouple-juniper update
saacg Mar 30, 2017
4844679
fixed update_clouds and update_hosts in HilDriver
saacg Mar 30, 2017
f62af6d
fixed rmcloud in HilDriver
saacg Mar 30, 2017
763a080
added to config file for demo
saacg Mar 30, 2017
1fc2462
committing for demo video
saacg Mar 30, 2017
b02cc0f
added print statements for video
saacg Mar 30, 2017
4066d33
update_host in HilDriver works
saacg Apr 4, 2017
10fab94
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Apr 4, 2017
ce951b8
Merge remote-tracking branch 'class/master' into update-class-decoupl…
saacg Apr 4, 2017
0857ef4
Merge remote-tracking branch 'class/decouple-juniper' into implement-…
saacg Apr 4, 2017
b9dc58a
cleanup
vsemp Apr 7, 2017
f19d8e9
Merge pull request #33 from vsemp/cleanup
vsemp Apr 7, 2017
3af6dbf
cleanup
vsemp Apr 7, 2017
f6a43a7
Merge pull request #34 from vsemp/cleanup
vsemp Apr 7, 2017
06ed2fd
broke down hardware_service class and implemented inventory_servie
saacg Apr 8, 2017
19f2138
implemented network_service based on parts of hardware_service not co…
saacg Apr 8, 2017
8ea6f96
created new hardware_driver files
saacg Apr 8, 2017
be045a4
skeleton of split design
saacg Apr 9, 2017
f3cd6c3
removed test_mock as it is no longer relevant
saacg Apr 9, 2017
c35a1f4
load write sync init (c)Vlad
vsemp Apr 11, 2017
d6f27fa
load write sync init (c)Vlad
vsemp Apr 11, 2017
2c8200a
load write sync init (c)Vlad
vsemp Apr 11, 2017
5938ea4
load write sync init (c)Vlad
vsemp Apr 11, 2017
630c057
load write sync init (c)Vlad
vsemp Apr 11, 2017
60cdecf
Release environment only after checks pass
kambiz-aghaiepour Apr 11, 2017
b1b33bd
Merge pull request #44 from vsemp/demo4
saacg Apr 11, 2017
af2c05a
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Apr 11, 2017
9564281
fixed merge conflicts
saacg Apr 11, 2017
639e69d
changed config file
saacg Apr 11, 2017
5ab6a74
concrete subclasses can be instantiated in libquads
saacg Apr 11, 2017
2d6c59c
Merge pull request #45 from saacg/instantiate-concrete-subclasses
sarthakjagetia Apr 11, 2017
57d30c3
Update .gitignore
saacg Apr 12, 2017
d83a35d
Pushing for help with Pytest
djfinn14 Apr 12, 2017
32f6a99
Speed up the visualization
kambiz-aghaiepour Apr 12, 2017
94211e7
QUADs method to query schedule
jtaleric Apr 12, 2017
b18b3d5
Merge "QUADs method to query schedule"
sadsfae Apr 12, 2017
e300913
Update MockNetworkDriver.py
sarthakjagetia Apr 12, 2017
ba7f920
Update MockNetworkDriver.py
sarthakjagetia Apr 12, 2017
d8a39af
deprecate bin/simple-table-generator.sh
kambiz-aghaiepour Apr 12, 2017
7e8806b
fix change introduced in --schedule-query
kambiz-aghaiepour Apr 13, 2017
14e179e
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Apr 13, 2017
37e4653
Merge remote-tracking branch 'class/master' into update-class-demo-4
saacg Apr 13, 2017
749ac82
PyTest for MockInventoryDriver for Demo4
djfinn14 Apr 13, 2017
94277be
MockInventoryDriver now behaves similarly to QuadsNative
saacg Apr 13, 2017
4ceb5f2
Merge pull request #47 from djfinn14/DanDemo4
saacg Apr 13, 2017
ec55d7c
Merge remote-tracking branch 'class/demo-4-branch' into mock-inventor…
saacg Apr 13, 2017
da419c6
added .cache to .gitignore
saacg Apr 13, 2017
95d8d62
Merge pull request #48 from saacg/mock-inventory-update
djfinn14 Apr 13, 2017
4fc6c82
introduce cloud_history
kambiz-aghaiepour Apr 13, 2017
b2e86e2
Add hoverover tooltip for visualization
kambiz-aghaiepour Apr 13, 2017
95a3d55
modified .gitignore to ignore testing/.cache/ files
saacg Apr 14, 2017
28e5eb4
Merge remote-tracking branch 'upstream/master' into update-class-master
saacg Apr 14, 2017
2a80cd6
merged master into demo-4-branch
saacg Apr 14, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update MockNetworkDriver.py
sarthakjagetia authored Apr 12, 2017
commit ba7f92008ceee734cb41ecaa16638900df6f5c97
2 changes: 1 addition & 1 deletion lib/hardware_services/network_drivers/MockNetworkDriver.py
Original file line number Diff line number Diff line change
@@ -47,5 +47,5 @@ def move_hosts(self, quadsinstance, **kwargs):
stream.close()
if current_state != current_cloud:
quadsinstance.logger.info("Moving " + h + " from " + current_state + " to " + current_cloud)
print "Moving "+ h+ " from " + default_cloud + " to " + current_cloud
print "Moving "+ h+ " from " + default_cloud + " to " + current_cloud
return